From d56c570797c673478b3a116a0ec3f47317f46643 Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Tue, 10 Oct 2000 21:40:49 +0000 Subject: [PATCH] Reapply Andy's patch and regen Configure. p4raw-id: //depot/perl@7196 --- Configure | 23 ++++++++++++++++++++++- INSTALL | 40 +++++++++++++++++++++++++++++++++++----- Makefile.SH | 7 ++++--- Porting/Glossary | 12 ++++++++++++ Porting/config.sh | 5 +++-- epoc/config.sh | 1 + installperl | 21 +++++++++++---------- uconfig.sh | 1 + vos/config.def | 1 + win32/config.bc | 1 + win32/config.gc | 1 + win32/config.vc | 1 + 12 files changed, 93 insertions(+), 21 deletions(-) diff --git a/Configure b/Configure index 25f9cad..d6a3062 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 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$$ <. -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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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' -- 2.7.4