From aee4a28e66fed46ddd2d478a0df63890738785d7 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sat, 17 Apr 2021 10:00:59 +0000
Subject: build system: configure: config_copy(): enhanced Makefile generation.

---
 configure | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a95494c..a100d6d 100755
--- a/configure
+++ b/configure
@@ -715,19 +715,28 @@ config_copy()
 {
 	output_step_prolog ${mb_script} 'config_copy'
 
+	mb_var_defs=
+	mb_sed_substs=
+
 	mb_vars=$(cut -d'=' -f1 "$sfrt_config_vars" "$sfrt_opt_vars" \
-			| grep -v '^#')
-
-	mb_sed_substs=" \
-		$(for __var in $(printf '%s' "$mb_vars"); do   \
-			printf '%s"$%s"%s' "-e 's^@$__var@^'" \
-				"mb_$__var" "'^g' ";           \
-		done)"
-
-	eval sed $mb_sed_substs \
-		$mb_project_dir/Makefile.in    \
-			| sed -e 's/[[:blank:]]*$//g' \
-			> $mb_pwd/Makefile.tmp
+		| grep -v '^#');
+
+	for __var in $(printf '%s' "$mb_vars"); do
+		mb_sed_subst=$(printf '%s %s%s%s'  \
+				'-e' "'s^@$__var@"  \
+				"^___${__var}___"    \
+				"^g'")
+
+		mb_sed_substs="$mb_sed_substs $mb_sed_subst"
+
+		mb_var_def=$(printf '%s%s="${%s}"' "-D" "___${__var}___" "mb_${__var}")
+		eval mb_var_defs='"$mb_var_defs "$mb_var_def'
+	done
+
+	eval sed $mb_sed_substs $mb_project_dir/Makefile.in \
+			| eval m4 $mb_var_defs -             \
+			| sed -e 's/[[:blank:]]*$//g'         \
+		> $mb_pwd/Makefile.tmp
 
 	output_step_epilog
 }
-- 
cgit v1.2.3