diff options
| author | Andy Dougherty <doughera@lafayette.edu> | 2001-07-11 09:30:27 -0400 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-07-12 03:39:18 +0000 |
| commit | e46bec4b2c85a0f04fcf7edc3663c98ed406debe (patch) | |
| tree | c0ab7b944fd638ebb4664fe0e148f7cbc59c31d2 | |
| parent | ea3bc3b7e52b89774afef85d7c4ccad9d53442b7 (diff) | |
| download | perl-e46bec4b2c85a0f04fcf7edc3663c98ed406debe.tar.gz | |
Re: [PATCH Configure] perl -V broken
Message-ID: <Pine.SOL.4.10.10107111329060.2021-100000@maxwell.phys.lafayette.edu>
p4raw-id: //depot/perl@11286
| -rwxr-xr-x | Configure | 15 | ||||
| -rw-r--r-- | myconfig.SH | 7 |
2 files changed, 11 insertions, 11 deletions
@@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Sun Jul 8 20:08:04 EET DST 2001 [metaconfig 3.0 PL70] +# Generated on Thu Jul 12 07:32:38 EET DST 2001 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -839,6 +839,7 @@ perl_patchlevel='' revision='' subversion='' version='' +version_patchlevel_string='' perl5='' perladmin='' perlpath='' @@ -6061,7 +6062,6 @@ prefixit='case "$3" in esac;; esac' - : get the patchlevel echo " " echo "Getting the current patchlevel..." >&4 @@ -6088,11 +6088,15 @@ if $test -r $rsrc/.patch ; then perl_patchlevel=`cat $rsrc/.patch` fi fi +: Define a handy string here to avoid duplication in myconfig.SH and configpm. +version_patchlevel_string="version $patchlevel subversion $subversion" case "$perl_patchlevel" in -0) ;; -'') $echo "(You have $package version $patchlevel subversion $subversion.)" ;; -*) $echo "(You have $package version $patchlevel subversion $subversion patchlevel $perl_patchlevel.)" ;; +0|'') ;; +*) version_patchlevel_string="$version_patchlevel_string patch $perl_patchlevel" ;; esac + +$echo "(You have $package $version_patchlevel_string.)" + case "$osname" in dos|vms) : XXX Should be a Configure test for double-dots in filenames. @@ -17364,6 +17368,7 @@ vendorlibexp='$vendorlibexp' vendorprefix='$vendorprefix' vendorprefixexp='$vendorprefixexp' version='$version' +version_patchlevel_string='$version_patchlevel_string' versiononly='$versiononly' vi='$vi' voidflags='$voidflags' diff --git a/myconfig.SH b/myconfig.SH index 3635dd72dc..9afa5449a9 100644 --- a/myconfig.SH +++ b/myconfig.SH @@ -12,11 +12,6 @@ case $PERL_CONFIG_SH in . $TOP/config.sh ;; esac -if $test "$PERL_PATCHLEVEL" -gt 0 ; then - patchlevel=" patchlevel $PERL_PATCHLEVEL" -else - patchlevel="" -fi : This forces SH files to create target in same directory as SH file. : This is so that make depend always knows where to find SH derivatives. case "$0" in @@ -32,7 +27,7 @@ $startsh # Note that the text lines /^Summary of/ .. /^\s*$/ are copied into Config.pm. cat <<'!NO!SUBS!' -Summary of my $package (revision $baserev version $PERL_VERSION subversion $PERL_SUBVERSION$patchlevel) configuration: +Summary of my $package (revision $baserev $version_patchlevel_string) configuration: Platform: osname=$osname, osvers=$osvers, archname=$archname uname='$myuname' |