fix that only overridable vars were initialized

Sun, 30 Nov 2025 13:19:24 +0100

author
Mike Becker <universe@uap-core.de>
date
Sun, 30 Nov 2025 13:19:24 +0100
changeset 171
9e4fd0d54ade
parent 170
2b62b9a7fd38
child 172
3ffb04ba3f41

fix that only overridable vars were initialized

src/main/resources/make/configure.vm file | annotate | diff | comparison | revisions
test/configure file | annotate | diff | comparison | revisions
test/configure2 file | annotate | diff | comparison | revisions
test/make/configure.vm file | annotate | diff | comparison | revisions
--- a/src/main/resources/make/configure.vm	Sun Nov 30 13:16:01 2025 +0100
+++ b/src/main/resources/make/configure.vm	Sun Nov 30 13:19:24 2025 +0100
@@ -158,7 +158,6 @@
       ; then
     :
     #foreach( $var in $cfg.vars )
-    #if( $var.overridable )
     if test -z "${D}${var.varName}__initialized__"; then
         ${var.varName}__initialized__=1
         #if( $var.exec )
@@ -168,7 +167,6 @@
         #end
     fi
     #end
-    #end
 fi
 #end
 
--- a/test/configure	Sun Nov 30 13:16:01 2025 +0100
+++ b/test/configure	Sun Nov 30 13:19:24 2025 +0100
@@ -160,16 +160,28 @@
         libdir__initialized__=1
         libdir=""
     fi
+    if test -z "$HOST__initialized__"; then
+        HOST__initialized__=1
+        HOST=`uname -n`
+    fi
 fi
 if true \
       && notisplatform "mingw" \
       ; then
     :
+    if test -z "$PWD__initialized__"; then
+        PWD__initialized__=1
+        PWD="pwd"
+    fi
 fi
 if true \
     && isplatform "mingw" \
       ; then
     :
+    if test -z "$PWD__initialized__"; then
+        PWD__initialized__=1
+        PWD="pwd -W"
+    fi
 fi
 
 # features
@@ -298,6 +310,7 @@
 exec_prefix=$exec_prefix
 libdir=$libdir
 HOST=$HOST
+PWD=$PWD
 __EOF__
 
 
--- a/test/configure2	Sun Nov 30 13:16:01 2025 +0100
+++ b/test/configure2	Sun Nov 30 13:19:24 2025 +0100
@@ -197,6 +197,10 @@
         libdatadir__initialized__=1
         libdatadir="$prefix/libdata"
     fi
+    if test -z "$SRCDIR__initialized__"; then
+        SRCDIR__initialized__=1
+        SRCDIR=`pwd`
+    fi
     if test -z "$TOOLKIT_HOME__initialized__"; then
         TOOLKIT_HOME__initialized__=1
         TOOLKIT_HOME="/usr"
--- a/test/make/configure.vm	Sun Nov 30 13:16:01 2025 +0100
+++ b/test/make/configure.vm	Sun Nov 30 13:19:24 2025 +0100
@@ -158,7 +158,6 @@
       ; then
     :
     #foreach( $var in $cfg.vars )
-    #if( $var.overridable )
     if test -z "${D}${var.varName}__initialized__"; then
         ${var.varName}__initialized__=1
         #if( $var.exec )
@@ -168,7 +167,6 @@
         #end
     fi
     #end
-    #end
 fi
 #end
 

mercurial