Reapply Andy's patch and regen Configure.

p4raw-id: //depot/perl@7196

diff --git a/Configure b/Configure
index 25f9cad..d6a3062 100755 (executable)
--- 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 Wed Oct 11 00:00:47 EET DST 2000 [metaconfig 3.0 PL70]
+# Generated on Wed Oct 11 00:32:36 EET DST 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >/tmp/c1$$ <<EOF
@@ -944,6 +944,7 @@ vendorlibexp=''
 usevendorprefix=''
 vendorprefix=''
 vendorprefixexp=''
+versiononly=''
 defvoidused=''
 voidflags=''
 pm_apiversion=''
@@ -7443,6 +7444,25 @@ else
        installvendorbin="$vendorbinexp"
 fi
 
+: determine whether to only install version-specific parts.
+echo " "
+$cat <<EOM
+Do you want to install only the version-specific parts of the perl
+distribution?  Usually you do *not* want to do this.
+EOM
+case "$versiononly" in
+"$define"|[Yy]*|true) dflt='y' ;;
+*) dflt='n';
+esac
+rp="Do you want to install only the version-specific parts of perl?"
+. ./myread
+case "$ans" in
+[yY]*) val="$define";;
+*)     val="$undef" ;;
+esac
+set versiononly
+eval $setvar
+
 : see if qgcvt exists
 set qgcvt d_qgcvt
 eval $inlibc
@@ -16010,6 +16030,7 @@ vendorlibexp='$vendorlibexp'
 vendorprefix='$vendorprefix'
 vendorprefixexp='$vendorprefixexp'
 version='$version'
+versiononly='$versiononly'
 vi='$vi'
 voidflags='$voidflags'
 xlibpth='$xlibpth'

diff --git a/INSTALL b/INSTALL
index f961024..50e7773 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -85,7 +85,7 @@ extensions that have not been updated for the new naming convention
 with:
 
        perl Makefile.PL POLLUTE=1
-       
+
 Alternatively, you can enable CPP symbol pollution wholesale by
 building perl itself with:
 
@@ -1831,12 +1831,17 @@ anything, you can run
 
 make install will install the following:
 
+    binaries
+
        perl,
            perl5.nnn   where nnn is the current release number.  This
                        will be a link to perl.
        suidperl,
            sperl5.nnn  If you requested setuid emulation.
        a2p             awk-to-perl translator
+
+    scripts
+
        cppstdin        This is used by perl -P, if your cc -E can't
                        read from stdin.
        c2ph, pstruct   Scripts for handling C structures in header files.
@@ -1849,13 +1854,21 @@ make install will install the following:
        pl2pm           Convert Perl 4 .pl files to Perl 5 .pm modules
        pod2html,       Converters from perl's pod documentation format
        pod2latex,      to other useful formats.
-       pod2man, and
-       pod2text
+       pod2man,
+       pod2text,
+       pod2checker,
+       pod2select,
+       pod2usage
        splain          Describe Perl warnings and errors
        dprofpp         Perl code profile post-processor
 
-       library files   in $privlib and $archlib specified to
+    library files
+
+                       in $privlib and $archlib specified to
                        Configure, usually under /usr/local/lib/perl5/.
+
+    documentation
+
        man pages       in $man1dir, usually /usr/local/man/man1.
        module man
        pages           in $man3dir, usually /usr/local/man/man3.
@@ -1864,11 +1877,28 @@ make install will install the following:
 Installperl will also create the directories listed above
 in L<"Installation Directories">.
 
-Perl's *.h header files and the libperl.a library are also installed
+Perl's *.h header files and the libperl library are also installed
 under $archlib so that any user may later build new modules, run the
 optional Perl compiler, or embed the perl interpreter into another
 program even if the Perl source is no longer available.
 
+Sometimes you only want to install the version-specific parts of the perl
+installation.  For example, you may wish to install a newer version of
+perl alongside an already installed production version of perl without
+disabling installation of new modules for the production version.
+To only install the version-specific parts of the perl installation, run
+
+       Configure -Dversiononly
+
+or answer 'y' to the appropriate Configure prompt.  Alternatively,
+you can just manually run
+
+       ./perl installperl -v
+
+and skip installman altogether.
+See also L<"Maintaining completely separate versions"> for another
+approach.
+
 =head1 Coexistence with earlier versions of perl5
 
 In general, you can usually safely upgrade from one version of Perl (e.g.

diff --git a/Makefile.SH b/Makefile.SH
index 392386b..5418fc4 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -204,11 +204,12 @@ SHELL = $sh
 # how to tr(anslate) newlines
 TRNL = '$trnl'
 
+!GROK!THIS!
 # not used by Makefile but by installperl;
-# mentioned here so that metaconfig picks it up
-INSTALL_USR_BIN_PERL = $installusrbinperl
+# mentioned here so that metaconfig picks these up
+# $installusrbinperl
+# $versiononly
 
-!GROK!THIS!
 
 ## In the following dollars and backticks do not need the extra backslash.
 $spitshell >>Makefile <<'!NO!SUBS!'

diff --git a/Porting/Glossary b/Porting/Glossary
index 8657346..1b93821 100644 (file)
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -3686,6 +3686,18 @@ version (patchlevel.U):
        This is suitable for use as a directory name, and hence is
        filesystem dependent.
 
+versiononly (versiononly.U):
+       If set, this symbol indicates that only the version-specific
+       components of a perl installation should be installed.
+       This may be useful for making a test installation of a new
+       version without disturbing the existing installation.
+       Setting versiononly is equivalent to setting installperl's -v option.
+       In particular, the non-versioned scripts and programs such as
+       a2p, c2ph, h2xs, pod2*, and perldoc are not installed
+       (see INSTALL for a more complete list).  Nor are the man
+       pages installed.
+       Usually, this is undef.
+
 vi (Loc.U):
        This variable is defined but not used by Configure.
        The value is a plain '' and is not useful.

diff --git a/Porting/config.sh b/Porting/config.sh
index c491fe8..bd63468 100644 (file)
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : /m/fs/work/work/permanent/perl/pp4/perl
-# Configuration time: Wed Oct 11 00:01:55 EET DST 2000
+# Configuration time: Wed Oct 11 00:34:23 EET DST 2000
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -62,7 +62,7 @@ ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_
 ccversion='V5.6-082'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Wed Oct 11 00:01:55 EET DST 2000'
+cf_time='Wed Oct 11 00:34:23 EET DST 2000'
 charsize='1'
 chgrp=''
 chmod=''
@@ -794,6 +794,7 @@ vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='5.7.0'
+versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'

diff --git a/epoc/config.sh b/epoc/config.sh
index d9be3a7..2687a77 100644 (file)
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -705,6 +705,7 @@ vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='5.7.0'
+versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth=''

diff --git a/installperl b/installperl
index c65af5a..99d376f 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -60,6 +60,8 @@ while (@ARGV) {
     shift;
 }
 
+$versiononly = 1 if $Config{versiononly};
+
 my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
                utils/pl2pm utils/splain utils/perlcc utils/dprofpp
                x2p/s2p x2p/find2perl 
@@ -364,26 +366,25 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) {
     chmod(0755, "$installbin/cppstdin");
 }
 
-# Install scripts.
+if (! $versiononly) {
+    # Install scripts.
 
-mkpath($installscript, $verbose, 0777);
+    mkpath($installscript, $verbose, 0777);
 
-if (! $versiononly) {
     for (@scripts) {
        (my $base = $_) =~ s#.*/##;
        copy($_, "$installscript/$base");
        chmod(0755, "$installscript/$base");
     }
-}
-
-# pstruct should be a link to c2ph
 
-if (! $versiononly) {
+    # pstruct should be a link to c2ph
     safe_unlink("$installscript/pstruct$scr_ext");
     if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
-        copy("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); 
+       copy("$installscript/c2ph$scr_ext",
+            "$installscript/pstruct$scr_ext"); 
     } else {
-        link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext");
+       link("$installscript/c2ph$scr_ext",
+            "$installscript/pstruct$scr_ext");
     }
 }
 
@@ -391,7 +392,7 @@ if (! $versiononly) {
 # ($installprivlib/pods for cygwin).
 
 my $pod = $Is_Cygwin ? 'pods' : 'pod';
-unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) {
+if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
     mkpath("${installprivlib}/$pod", $verbose, 0777);
 
     # If Perl 5.003's perldiag.pod is there, rename it.

diff --git a/uconfig.sh b/uconfig.sh
index 373db77..faf618a 100755 (executable)
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -529,6 +529,7 @@ uvsize='4'
 uvtype='unsigned long'
 uvuformat='"lu"'
 uvxformat='"lx"'
+versiononly='undef'
 voidflags=1
 xs_apiversion='5.005'
 d_getfsstat='undef'

diff --git a/vos/config.def b/vos/config.def
index cdb8f81..4edc806 100644 (file)
--- a/vos/config.def
+++ b/vos/config.def
@@ -482,5 +482,6 @@ $vendorarch=''
 $vendorarchexp=''
 $vendorlib_stem=''
 $vendorlibexp=''
+$versiononly='undef'
 $voidflags='15'
 $xs_apiversion='5.00563'

diff --git a/win32/config.bc b/win32/config.bc
index b617117..5ee4027 100644 (file)
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -769,6 +769,7 @@ vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='~VERSION~'
+versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'

diff --git a/win32/config.gc b/win32/config.gc
index 639be82..b27c8e5 100644 (file)
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -769,6 +769,7 @@ vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='~VERSION~'
+versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'

diff --git a/win32/config.vc b/win32/config.vc
index 2dfe830..59295f5 100644 (file)
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -769,6 +769,7 @@ vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='~VERSION~'
+versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'