From 32c694affaa9f6015889e8e55996d696e5ad1dc7 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Thu, 13 Dec 2018 07:58:29 -0500
Subject: build system: configure: cfgdefs.mk must always be written from
 scratch.

---
 configure | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a7f5808..acf3d1d 100755
--- a/configure
+++ b/configure
@@ -57,6 +57,16 @@ init_vars()
 		. "$mb_config" || exit 2
 	fi
 
+	# project-specific config definitions
+	if [ $mb_use_custom_cfgdefs = 'yes' ]; then
+		cat < /dev/null > cfgdefs.mk
+	fi
+
+	# user build-time overrides
+	if [ $mb_use_custom_usrdefs = 'yes' ]; then
+		touch usrdefs.mk
+	fi
+
 	# project
 	mb_nickname=$NICKNAME
 	mb_source_dir=$SOURCE_DIR
@@ -579,14 +589,6 @@ config_copy()
 			-e 's^@use_custom_usrdefs@^'"$mb_use_custom_usrdefs"'^g'	\
 		$mb_project_dir/Makefile.in > $mb_pwd/Makefile.tmp || exit 2
 
-	if [ $mb_use_custom_cfgdefs = 'yes' ]; then
-		touch cfgdefs.mk
-	fi
-
-	if [ $mb_use_custom_usrdefs = 'yes' ]; then
-		touch usrdefs.mk
-	fi
-
 	if [ -z "$mb_cchost" ]; then
 		if [ "$mb_host" = 'native' ]; then
 			mb_cchost=`make -s -f $mb_pwd/Makefile.tmp cchost`
-- 
cgit v1.2.3