# HG changeset patch # User Mike Becker # Date 1696614245 -7200 # Node ID 85f5188acc21ab0cce050330aeb3909c26abb6ee # Parent ea79a383ad7554aa9266b20d225165bc0a40722b use ${D} instead of hoping for $$ to always work diff -r ea79a383ad75 -r 85f5188acc21 test/make/configure.vm --- a/test/make/configure.vm Fri Oct 06 19:35:07 2023 +0200 +++ b/test/make/configure.vm Fri Oct 06 19:44:05 2023 +0200 @@ -217,7 +217,7 @@ INFODIR="$INFODIR" MANDIR="$MANDIR" #foreach( $var in $vars ) -${var.varName}="$${var.varName}" +${var.varName}="${D}${var.varName}" #end __EOF__ sort -u -o "$TEMP_DIR/vars.mk" "$TEMP_DIR/vars.mk" @@ -471,12 +471,12 @@ # Features #foreach( $feature in $target.features ) -if [ -n "$${feature.varName}" ]; then +if [ -n "${D}${feature.varName}" ]; then #foreach( $dependency in $feature.dependencies ) # check dependency if dependency_error_$dependency ; then # "auto" features can fail and are just disabled in this case - if [ "$${feature.varName}" = "auto" ]; then + if [ "${D}${feature.varName}" = "auto" ]; then DISABLE_${feature.varName}=1 else DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} " @@ -582,7 +582,7 @@ #if ( $features.size() > 0 ) echo "Features:" #foreach( $feature in $features ) -if [ -n "$${feature.varName}" ]; then +if [ -n "${D}${feature.varName}" ]; then echo " $feature.name: on" else echo " $feature.name: off"