Mercurial > hg > uwproj / changeset

--- a/src/main/resources/make/configure.vm	Mon Dec 01 20:32:12 2025 +0100
+++ b/src/main/resources/make/configure.vm	Mon Dec 01 20:38:17 2025 +0100
@@ -309,20 +309,18 @@
 ## End of unparsed content **
 
 # generate vars.mk
-cat > "$TEMP_DIR/vars.mk" << __EOF__
-#foreach( $var in $vars )
-${var.varName}=${D}${var.varName}
-#end
-
-__EOF__
-
+if [ ${D}has_config_vars__ -eq 1 ]; then
+    echo '# configuration' > "$TEMP_DIR/vars.mk"
+    #foreach( $var in $vars )
+    echo "${var.varName}=${D}${var.varName}" >> "$TEMP_DIR/vars.mk"
+    #end
+    echo >> "$TEMP_DIR/vars.mk"
+fi
 
 #
 # DEPENDENCIES
 #
 
-
-
 # create buffer for make variables required by dependencies
 echo > "$TEMP_DIR/make.mk"
 

--- a/test/configure	Mon Dec 01 20:32:12 2025 +0100
+++ b/test/configure	Mon Dec 01 20:38:17 2025 +0100
@@ -315,22 +315,20 @@
 
 
 # generate vars.mk
-cat > "$TEMP_DIR/vars.mk" << __EOF__
-prefix=$prefix
-exec_prefix=$exec_prefix
-libdir=$libdir
-HOST=$HOST
-PWD=$PWD
-
-__EOF__
-
+if [ $has_config_vars__ -eq 1 ]; then
+    echo '# configuration' > "$TEMP_DIR/vars.mk"
+    echo "prefix=$prefix" >> "$TEMP_DIR/vars.mk"
+    echo "exec_prefix=$exec_prefix" >> "$TEMP_DIR/vars.mk"
+    echo "libdir=$libdir" >> "$TEMP_DIR/vars.mk"
+    echo "HOST=$HOST" >> "$TEMP_DIR/vars.mk"
+    echo "PWD=$PWD" >> "$TEMP_DIR/vars.mk"
+    echo >> "$TEMP_DIR/vars.mk"
+fi
 
 #
 # DEPENDENCIES
 #
 
-
-
 # create buffer for make variables required by dependencies
 echo > "$TEMP_DIR/make.mk"
 

--- a/test/configure2	Mon Dec 01 20:32:12 2025 +0100
+++ b/test/configure2	Mon Dec 01 20:38:17 2025 +0100
@@ -150,7 +150,7 @@
 Optional Features:
   --disable-db            Needlessly adds a completely useless SQLite database 
                           by default.
-                          Here another line to test  tabs  and line
+                          Here another line to test tabs and line
 
                           breaks.
   --enable-gui
@@ -345,25 +345,23 @@
 
 
 # generate vars.mk
-cat > "$TEMP_DIR/vars.mk" << __EOF__
-prefix=$prefix
-exec_prefix=$exec_prefix
-libdir=$libdir
-datarootdir=$datarootdir
-localstatedir=$localstatedir
-libdatadir=$libdatadir
-SRCDIR=$SRCDIR
-TOOLKIT_HOME=$TOOLKIT_HOME
-
-__EOF__
-
+if [ $has_config_vars__ -eq 1 ]; then
+    echo '# configuration' > "$TEMP_DIR/vars.mk"
+    echo "prefix=$prefix" >> "$TEMP_DIR/vars.mk"
+    echo "exec_prefix=$exec_prefix" >> "$TEMP_DIR/vars.mk"
+    echo "libdir=$libdir" >> "$TEMP_DIR/vars.mk"
+    echo "datarootdir=$datarootdir" >> "$TEMP_DIR/vars.mk"
+    echo "localstatedir=$localstatedir" >> "$TEMP_DIR/vars.mk"
+    echo "libdatadir=$libdatadir" >> "$TEMP_DIR/vars.mk"
+    echo "SRCDIR=$SRCDIR" >> "$TEMP_DIR/vars.mk"
+    echo "TOOLKIT_HOME=$TOOLKIT_HOME" >> "$TEMP_DIR/vars.mk"
+    echo >> "$TEMP_DIR/vars.mk"
+fi
 
 #
 # DEPENDENCIES
 #
 
-
-
 # create buffer for make variables required by dependencies
 echo > "$TEMP_DIR/make.mk"
 
@@ -931,31 +929,31 @@
 if [ $has_config_vars__ -eq 1 ]; then
     echo
     echo "Config:"
-    if [ -n "$prefix_initialized__" ]; then
+    if [ -n "$prefix__initialized__" ]; then
         printf '  %-16s' 'prefix:'
         echo "$prefix"
     fi
-    if [ -n "$exec_prefix_initialized__" ]; then
+    if [ -n "$exec_prefix__initialized__" ]; then
         printf '  %-16s' 'exec-prefix:'
         echo "$exec_prefix"
     fi
-    if [ -n "$libdir_initialized__" ]; then
+    if [ -n "$libdir__initialized__" ]; then
         printf '  %-16s' 'libdir:'
         echo "$libdir"
     fi
-    if [ -n "$datarootdir_initialized__" ]; then
+    if [ -n "$datarootdir__initialized__" ]; then
         printf '  %-16s' 'datarootdir:'
         echo "$datarootdir"
     fi
-    if [ -n "$localstatedir_initialized__" ]; then
+    if [ -n "$localstatedir__initialized__" ]; then
         printf '  %-16s' 'localstatedir:'
         echo "$localstatedir"
     fi
-    if [ -n "$libdatadir_initialized__" ]; then
+    if [ -n "$libdatadir__initialized__" ]; then
         printf '  %-16s' 'libdatadir:'
         echo "$libdatadir"
     fi
-    if [ -n "$TOOLKIT_HOME_initialized__" ]; then
+    if [ -n "$TOOLKIT_HOME__initialized__" ]; then
         printf '  %-16s' 'toolkit-home:'
         echo "$TOOLKIT_HOME"
     fi

--- a/test/make/configure.vm	Mon Dec 01 20:32:12 2025 +0100
+++ b/test/make/configure.vm	Mon Dec 01 20:38:17 2025 +0100
@@ -309,20 +309,18 @@
 ## End of unparsed content **
 
 # generate vars.mk
-cat > "$TEMP_DIR/vars.mk" << __EOF__
-#foreach( $var in $vars )
-${var.varName}=${D}${var.varName}
-#end
-
-__EOF__
-
+if [ ${D}has_config_vars__ -eq 1 ]; then
+    echo '# configuration' > "$TEMP_DIR/vars.mk"
+    #foreach( $var in $vars )
+    echo "${var.varName}=${D}${var.varName}" >> "$TEMP_DIR/vars.mk"
+    #end
+    echo >> "$TEMP_DIR/vars.mk"
+fi
 
 #
 # DEPENDENCIES
 #
 
-
-
 # create buffer for make variables required by dependencies
 echo > "$TEMP_DIR/make.mk"