Change 11286 by jhi@alpha on 2001/07/12 03:39:18
Subject: Re: [PATCH Configure] perl -V broken
From: Andy Dougherty <[EMAIL PROTECTED]>
Date: Wed, 11 Jul 2001 13:30:27 -0400 (EDT)
Message-ID:
<[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/Configure#335 edit
... //depot/perl/myconfig.SH#14 edit
Differences ...
==== //depot/perl/Configure#335 (xtext) ====
Index: perl/Configure
--- perl/Configure.~1~ Wed Jul 11 21:45:06 2001
+++ perl/Configure Wed Jul 11 21:45:06 2001
@@ -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 [EMAIL PROTECTED])
cat >c1$$ <<EOF
@@ -839,6 +839,7 @@
revision=''
subversion=''
version=''
+version_patchlevel_string=''
perl5=''
perladmin=''
perlpath=''
@@ -6061,7 +6062,6 @@
esac;;
esac'
-
: get the patchlevel
echo " "
echo "Getting the current patchlevel..." >&4
@@ -6088,11 +6088,15 @@
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 @@
vendorprefix='$vendorprefix'
vendorprefixexp='$vendorprefixexp'
version='$version'
+version_patchlevel_string='$version_patchlevel_string'
versiononly='$versiononly'
vi='$vi'
voidflags='$voidflags'
==== //depot/perl/myconfig.SH#14 (text) ====
Index: perl/myconfig.SH
--- perl/myconfig.SH.~1~ Wed Jul 11 21:45:06 2001
+++ perl/myconfig.SH Wed Jul 11 21:45:06 2001
@@ -12,11 +12,6 @@
. $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 @@
# 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'
End of Patch.
