summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-12-13 07:58:29 -0500
committermidipix <writeonce@midipix.org>2018-12-13 09:39:04 -0500
commitaa4d91228d4b12a3ef9067993c0cf021f2b8afa9 (patch)
tree45e8ca8e662ac67002ca22e0095a410c5930f3e0
parent2216cf5a5fcf80fea8152d08b7e10bd01c8c078d (diff)
downloadsbpython2-aa4d91228d4b12a3ef9067993c0cf021f2b8afa9.tar.bz2
sbpython2-aa4d91228d4b12a3ef9067993c0cf021f2b8afa9.tar.xz
build system: configure: cfgdefs.mk must always be written from scratch.
-rwxr-xr-xconfigure18
1 files changed, 10 insertions, 8 deletions
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`