aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile2
-rw-r--r--build-system/configure.py (renamed from configure.py)0
m---------build-system/taler-build-scripts0
4 files changed, 2 insertions, 2 deletions
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/configure.py b/build-system/configure.py
index 4595aae10..4595aae10 100644
--- a/configure.py
+++ b/build-system/configure.py
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
-Subproject d1f949d0cbe30839eb53f34e2a8b34f61e0ad33
+Subproject f65d933845faa73a864cce17a8ccd575d8da9f1