From 16bf55622a2813a98e53e3a7311d201f1a46d71a Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 3 Aug 2020 13:22:29 +0530
Subject: build system

---
 .gitignore                       |  2 +-
 Makefile                         |  2 +-
 build-system/configure.py        | 20 ++++++++++++++++++++
 build-system/taler-build-scripts |  2 +-
 configure.py                     | 20 --------------------
 5 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 build-system/configure.py
 delete mode 100644 configure.py

diff --git a/.gitignore b/.gitignore
index 91b045338..fcd5c096c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ yarn-error.log
 npm-packages-offline-cache/
 
 /configure
-/config.mk
+build-system/config.mk
 
 
 \#*\#
diff --git a/Makefile b/Makefile
index 8d31bfc1a..342f7c144 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ typedoc = node_modules/typedoc/bin/typedoc
 ava = node_modules/.bin/ava
 nyc = node_modules/nyc/bin/nyc.js
 
-include config.mk
+include ./build-system/config.mk
 
 .PHONY: compile
 compile:
diff --git a/build-system/configure.py b/build-system/configure.py
new file mode 100644
index 000000000..4595aae10
--- /dev/null
+++ b/build-system/configure.py
@@ -0,0 +1,20 @@
+# This configure.py file is places in the public domain.
+
+# Configure the build directory.
+# This file is invoked by './configure' and should usually not be invoked
+# manually.
+
+import talerbuildconfig as tbc
+import sys
+
+if getattr(tbc, "serialversion", 0) < 2:
+    print("talerbuildconfig outdated, please update the build-common submodule and/or bootstrap")
+    sys.exit(1)
+
+b = tbc.BuildConfig()
+b.enable_prefix()
+b.enable_configmk()
+b.add_tool(tbc.PosixTool("find"))
+b.add_tool(tbc.NodeJsTool(version_spec=">=12"))
+b.add_tool(tbc.YarnTool())
+b.run()
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index d1f949d0c..f65d93384 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit d1f949d0cbe30839eb53f34e2a8b34f61e0ad33a
+Subproject commit f65d933845faa73a864cce17a8ccd575d8da9f10
diff --git a/configure.py b/configure.py
deleted file mode 100644
index 4595aae10..000000000
--- a/configure.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# This configure.py file is places in the public domain.
-
-# Configure the build directory.
-# This file is invoked by './configure' and should usually not be invoked
-# manually.
-
-import talerbuildconfig as tbc
-import sys
-
-if getattr(tbc, "serialversion", 0) < 2:
-    print("talerbuildconfig outdated, please update the build-common submodule and/or bootstrap")
-    sys.exit(1)
-
-b = tbc.BuildConfig()
-b.enable_prefix()
-b.enable_configmk()
-b.add_tool(tbc.PosixTool("find"))
-b.add_tool(tbc.NodeJsTool(version_spec=">=12"))
-b.add_tool(tbc.YarnTool())
-b.run()
-- 
cgit v1.2.3