From c32b80c1764f8a594bc085bd74382a5522b89c24 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 28 Oct 2022 14:48:50 +0200 Subject: [PATCH] build system: use makefile directly, not from template --- .gitignore | 2 +- build-system/Makefile => Makefile | 0 build-system/configure.py | 5 +---- 3 files changed, 2 insertions(+), 5 deletions(-) rename build-system/Makefile => Makefile (100%) diff --git a/.gitignore b/.gitignore index dac7021e0..caad3b393 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ build/ # GNU-style build system /configure /build-system/config.mk -/Makefile +/.config.mk # Editor files \#*\# diff --git a/build-system/Makefile b/Makefile similarity index 100% rename from build-system/Makefile rename to Makefile diff --git a/build-system/configure.py b/build-system/configure.py index a4a936229..b127ba780 100644 --- a/build-system/configure.py +++ b/build-system/configure.py @@ -14,7 +14,7 @@ if getattr(tbc, "serialversion", 0) < 2: b = tbc.BuildConfig() b.enable_prefix() -b.enable_configmk() +b.enable_configmk(dotfile=True) b.add_tool(tbc.PosixTool("make")) b.add_tool(tbc.PosixTool("zip")) b.add_tool(tbc.PosixTool("find")) @@ -23,6 +23,3 @@ b.add_tool(tbc.NodeJsTool(version_spec=">=12")) b.add_tool(tbc.GenericTool("npm")) b.add_tool(tbc.GenericTool("pnpm", hint="Use 'sudo npm install -g pnpm' to install.")) b.run() - -print("copying Makefile") -shutil.copyfile("build-system/Makefile", "Makefile")