From: Jarkko Hietaniemi Date: Tue, 15 May 2001 13:12:40 +0000 (+0000) Subject: The problem described in 20010514.031 still wasn't X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a02608dec28d4e964c218e69ee3e39c623232d8d;p=p5sagit%2Fp5-mst-13.2.git The problem described in 20010514.031 still wasn't fully cured, there were remnants of $CONFIG when $CONFIGDOTSH was expected. Now renamed to PERL_CONFIG_SH to avoid future conflicts. p4raw-id: //depot/perl@10113 --- diff --git a/Configure b/Configure index 875fa9b..55641a8 100755 --- a/Configure +++ b/Configure @@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Thu May 10 17:37:57 EET DST 2001 [metaconfig 3.0 PL70] +# Generated on Tue May 15 16:44:30 EET DST 2001 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <extract <<'EOS' -CONFIGDOTSH=true +PERL_CONFIG_SH=true echo "Doing variable substitutions on .SH files..." if test -f $src/MANIFEST; then set x `awk '{print $1}' <$src/MANIFEST | grep '\.SH$'` @@ -16892,7 +16892,7 @@ $test -f UU/cmdline.opt && $cat UU/cmdline.opt >> config.sh : add special variables $test -f $src/patchlevel.h && \ awk '/^#define[ ]+PERL_/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh -echo "CONFIGDOTSH=true" >>config.sh +echo "PERL_CONFIG_SH=true" >>config.sh : propagate old symbols if $test -f UU/config.sh; then diff --git a/Makefile.SH b/Makefile.SH index c3b1548..7c160d9 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -1,5 +1,5 @@ #! /bin/sh -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh then TOP=. diff --git a/Policy_sh.SH b/Policy_sh.SH index fec18b9..aefa08f 100644 --- a/Policy_sh.SH +++ b/Policy_sh.SH @@ -1,4 +1,4 @@ -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') . ./config.sh ;; esac echo "Extracting Policy.sh (with variable substitutions)" diff --git a/cflags.SH b/cflags.SH index d215255..f76d7fb 100755 --- a/cflags.SH +++ b/cflags.SH @@ -1,4 +1,4 @@ -case $CONFIG in +case $PERL_CONFIG_SH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; @@ -28,7 +28,7 @@ $startsh : In the following dollars and backticks do not need the extra backslash. $spitshell >>cflags <<'!NO!SUBS!' -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/config_h.SH b/config_h.SH index 9188b79..bc6b650 100644 --- a/config_h.SH +++ b/config_h.SH @@ -4,7 +4,7 @@ esac case "$CONFIG_H" in '') CONFIG_H=config.h ;; esac -case $CONFIG in +case $PERL_CONFIG_SH in '') if test -f $CONFIG_SH; then TOP=.; elif test -f ../$CONFIG_SH; then TOP=..; diff --git a/configpm b/configpm index 6b5252c..b98bf82 100755 --- a/configpm +++ b/configpm @@ -60,7 +60,7 @@ $in_v = 0; while (<>) { next if m:^#!/bin/sh:; - # Catch CONFIGDOTSH=true and PERL_VERSION=n line from Configure. + # Catch PERL_CONFIG_SH=true and PERL_VERSION=n line from Configure. s/^(\w+)=(true|\d+)\s*$/$1='$2'\n/; my ($k,$v) = ($1,$2); # grandfather PATCHLEVEL and SUBVERSION and CONFIG @@ -71,7 +71,7 @@ while (<>) { elsif ($k eq 'PERL_SUBVERSION') { push @v_others, "SUBVERSION='$v'\n"; } - elsif ($k eq 'CONFIGDOTSH') { + elsif ($k eq 'PERL_CONFIG_SH') { push @v_others, "CONFIG='$v'\n"; } } @@ -474,11 +474,11 @@ require $config_pm; import Config; die "$0: $config_pm not valid" - unless $Config{'CONFIGDOTSH'} eq 'true'; + unless $Config{'PERL_CONFIG_SH'} eq 'true'; die "$0: error processing $config_pm" if defined($Config{'an impossible name'}) - or $Config{'CONFIGDOTSH'} ne 'true' # test cache + or $Config{'PERL_CONFIG_SH'} ne 'true' # test cache ; die "$0: error processing $config_pm" diff --git a/configure.com b/configure.com index a1c26a7..209f4ec 100644 --- a/configure.com +++ b/configure.com @@ -5580,7 +5580,7 @@ $ WC "vms_prefix='" + vms_prefix + "'" ! VMS specific $ WC "vms_ver='" + vms_ver + "'" ! VMS specific $ WC "voidflags='15'" $ WC "xs_apiversion='" + version + "'" -$ WC "CONFIGDOTSH='true'" +$ WC "PERL_CONFIG_SH='true'" $! $! ##END WRITE NEW CONSTANTS HERE## $! diff --git a/makeaperl.SH b/makeaperl.SH index 45812ba..80c0f21 100644 --- a/makeaperl.SH +++ b/makeaperl.SH @@ -1,4 +1,4 @@ -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/makedepend.SH b/makedepend.SH index 579be0b..ec21795 100755 --- a/makedepend.SH +++ b/makedepend.SH @@ -1,5 +1,5 @@ #! /bin/sh -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; @@ -41,7 +41,7 @@ esac export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh \$0; kill \$\$) -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/makedir.SH b/makedir.SH index d1650e7..19a6ad6 100755 --- a/makedir.SH +++ b/makedir.SH @@ -1,4 +1,4 @@ -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test ! -f config.sh; then ln ../config.sh . || \ diff --git a/myconfig.SH b/myconfig.SH index e80dfb5..59a173d 100644 --- a/myconfig.SH +++ b/myconfig.SH @@ -1,4 +1,4 @@ -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/writemain.SH b/writemain.SH index 18544c1..ed8aca6 100644 --- a/writemain.SH +++ b/writemain.SH @@ -1,4 +1,4 @@ -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..;