diff options
author | Florian Dold <florian@dold.me> | 2022-10-28 14:48:50 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2022-10-28 14:48:50 +0200 |
commit | c32b80c1764f8a594bc085bd74382a5522b89c24 (patch) | |
tree | b1b16fae5ce3c15f512eb366ef6f26a236fe1f8a | |
parent | 390276fc53d3f337ef388729d0f1b0086d2a6a21 (diff) | |
download | wallet-core-c32b80c1764f8a594bc085bd74382a5522b89c24.tar.xz |
build system: use makefile directly, not from template
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Makefile (renamed from build-system/Makefile) | 0 | ||||
-rw-r--r-- | build-system/configure.py | 5 |
3 files changed, 2 insertions, 5 deletions
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 index 2cf44cc5b..2cf44cc5b 100644 --- a/build-system/Makefile +++ b/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") |