From 360d6fb0aa9e6f5f49d14422602bdaf2336c2fd2 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Tue, 25 Dec 2018 04:16:05 -0500
Subject: build system: Makefile.in: always include cfgdefs.mk & usrdefs.mk.

The purpose of this commit is twofold; from the user's perspective, this
provides a consistent experience whenever building a sofort-based project;
and from the developer's perspective, this provides an easy way to test
cfgdefs.mk even before the writing and/or integration of cfgdefs.sh.
---
 Makefile.in       |  5 -----
 configure         | 13 +++++++++----
 sofort/cfgdefs.in |  5 +++++
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 sofort/cfgdefs.in

diff --git a/Makefile.in b/Makefile.in
index e0029cc..400f5f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,13 +119,8 @@ include $(PROJECT_DIR)/sysinfo/compiler/$(COMPILER).mk
 include $(PROJECT_DIR)/sysinfo/toolchain/$(TOOLCHAIN).mk
 include $(PROJECT_DIR)/sysinfo/os/$(OS).mk
 
-ifeq ($(USE_CUSTOM_CFGDEFS),yes)
 include ./cfgdefs.mk
-endif
-
-ifeq ($(USE_CUSTOM_USRDEFS),yes)
 include ./usrdefs.mk
-endif
 
 include $(PROJECT_DIR)/sofort/defs.mk
 include $(PROJECT_DIR)/sofort/flavor.mk
diff --git a/configure b/configure
index 96ab8a7..e88666c 100755
--- a/configure
+++ b/configure
@@ -63,13 +63,18 @@ init_vars()
 
 	# project-specific config definitions
 	if [ _$mb_use_custom_cfgdefs = _yes ]; then
-		cat < /dev/null > cfgdefs.mk
+		cat $mb_project_dir/sofort/cfgdefs.in \
+			> cfgdefs.mk
+	else
+		printf '%s %s\n\n' \
+				'# this project does not include' \
+				'a custom config step.'           \
+			> cfgdefs.mk
+		cat $mb_project_dir/sofort/cfgdefs.in >> cfgdefs.mk
 	fi
 
 	# user build-time overrides
-	if [ _$mb_use_custom_usrdefs = _yes ]; then
-		touch usrdefs.mk
-	fi
+	touch usrdefs.mk
 
 	# project
 	mb_nickname=$NICKNAME
diff --git a/sofort/cfgdefs.in b/sofort/cfgdefs.in
new file mode 100644
index 0000000..4627d90
--- /dev/null
+++ b/sofort/cfgdefs.in
@@ -0,0 +1,5 @@
+# changes made to this file will be gone the next time
+#   you run ./configure.
+
+# for persistent post-configure, ad-hoc changes to the
+#   build project, use usrdefs.mk instead.
-- 
cgit v1.2.3