mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 16:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

The problem described in 20010514.031 still wasn't

Browse Source 
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
This commit is contained in:
Jarkko Hietaniemi 2001-05-15 13:12:40 +00:00
parent b73b7152f5
commit a02608dec2
12 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Configure
View File

@ -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$$ <<EOF
@ -1499,7 +1499,7 @@ esac
: script used to extract .SH files with variable substitutions
cat >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

2
Makefile.SH
View File

@ -1,5 +1,5 @@
#! /bin/sh
case $CONFIGDOTSH in
case $PERL_CONFIG_SH in
'')
if test -f config.sh
then TOP=.

2
Policy_sh.SH
View File

@ -1,4 +1,4 @@
case $CONFIGDOTSH in
case $PERL_CONFIG_SH in
'') . ./config.sh ;;
esac
echo "Extracting Policy.sh (with variable substitutions)"

4
cflags.SH
View File

@ -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=..;

2
config_h.SH
View File

@ -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=..;

8
configpm
View File

@ -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"

2
configure.com
View File

@ -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##
$!

2
makeaperl.SH
View File

@ -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=..;

4
makedepend.SH
View File

@ -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=..;

2
makedir.SH
View File

@ -1,4 +1,4 @@
case $CONFIGDOTSH in
case $PERL_CONFIG_SH in
'')
if test ! -f config.sh; then
ln ../config.sh . || \

2
myconfig.SH
View File

@ -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=..;

2
writemain.SH
View File

@ -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=..;