diff options
| -rwxr-xr-x | Configure | 25 | ||||
| -rw-r--r-- | INSTALL | 32 | ||||
| -rw-r--r-- | Makefile.SH | 3 | ||||
| -rw-r--r-- | Porting/Glossary | 8 | ||||
| -rw-r--r-- | Porting/config.sh | 12 | ||||
| -rw-r--r-- | Porting/config_H | 2 | ||||
| -rw-r--r-- | epoc/config.sh | 1 | ||||
| -rwxr-xr-x | installperl | 36 | ||||
| -rwxr-xr-x | uconfig.sh | 1 | ||||
| -rw-r--r-- | vos/config.def | 1 | ||||
| -rw-r--r-- | win32/config.bc | 1 | ||||
| -rw-r--r-- | win32/config.gc | 1 | ||||
| -rw-r--r-- | win32/config.vc | 1 |
13 files changed, 96 insertions, 28 deletions
@@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Wed Oct 4 01:09:27 EET DST 2000 [metaconfig 3.0 PL70] +# Generated on Thu Oct 5 01:50:43 EET DST 2000 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >/tmp/c1$$ <<EOF @@ -709,6 +709,7 @@ inc_version_list='' inc_version_list_init='' installprefix='' installprefixexp='' +installscripts='' installstyle='' installusrbinperl='' intsize='' @@ -6266,6 +6267,27 @@ case "$inc_version_list" in esac $rm -f getverlist +: determine whether to install the scripts + +echo " " +$cat <<EOM +Do you want to install the various scripts accompanying Perl? +Usually you do want this. + +EOM +case "$installscripts" in +"$undef"|[nN]*) dflt='n';; +*) dflt='y';; +esac +rp="Do you want to install the scripts?" +. ./myread +case "$ans" in +[yY]*) val="$define";; +*) val="$undef" ;; +esac +set installscripts +eval $setvar + : determine whether to install perl also as /usr/bin/perl echo " " @@ -15742,6 +15764,7 @@ installprefix='$installprefix' installprefixexp='$installprefixexp' installprivlib='$installprivlib' installscript='$installscript' +installscripts='$installscripts' installsitearch='$installsitearch' installsitebin='$installsitebin' installsitelib='$installsitelib' @@ -1831,11 +1831,16 @@ 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. + + scripts + a2p awk-to-perl translator cppstdin This is used by perl -P, if your cc -E can't read from stdin. @@ -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,22 @@ 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 do no want to install the scripts. This may be the case +for example when installing a newer version of perl alongside an +already installed production version of perl without disabling +installation of new modules for the production version. To not to +install the scripts run + + Configure -Uinstallscripts + +(note the plural 'scripts') or by answering 'no' to the appropriate +Configure prompt. + =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 392386b9f1..50a81e24b5 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -205,8 +205,9 @@ SHELL = $sh TRNL = '$trnl' # not used by Makefile but by installperl; -# mentioned here so that metaconfig picks it up +# mentioned here so that metaconfig picks these up INSTALL_USR_BIN_PERL = $installusrbinperl +INSTALL_SCRIPTS = $installscripts !GROK!THIS! diff --git a/Porting/Glossary b/Porting/Glossary index 0899d79446..7988b4f226 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -2351,6 +2351,10 @@ installscript (scriptdir.U): a system running AFS, in which case they may differ slightly. You should always use this variable within your makefiles for portability. +installscripts (installscripts.U): + This variable tells whether the various scripts accompanying + Perl should be installed. Usually this is the case. + installsitearch (sitearch.U): This variable is really the same as sitearchexp but may differ on those systems using AFS. For extra portability, only this variable @@ -2886,6 +2890,10 @@ PERL_VERSION (Oldsyms.U): perladmin (perladmin.U): Electronic mail address of the perl5 administrator. +perllibs (End.U): + The list of libraries needed by Perl only (any libraries needed + by extensions only will by dropped, if using dynamic loading). + perlpath (perlpath.U): This variable contains the eventual value of the PERLPATH symbol, which contains the name of the perl interpreter to be used in diff --git a/Porting/config.sh b/Porting/config.sh index 6af2537e83..7c4e219849 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: Fri Sep 8 23:45:25 EET DST 2000 +# Configuration time: Thu Oct 5 01:56:14 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='Fri Sep 8 23:45:25 EET DST 2000' +cf_time='Thu Oct 5 01:56:14 EET DST 2000' charsize='1' chgrp='' chmod='' @@ -394,7 +394,7 @@ dlext='so' dlsrc='dl_dlopen.xs' doublesize='8' drand01='drand48()' -dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re' +dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Encode Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re' eagain='EAGAIN' ebcdic='undef' echo='echo' @@ -403,7 +403,7 @@ emacs='' eunicefix=':' exe_ext='' expr='expr' -extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re Errno' +extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Encode Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re Errno' fflushNULL='define' fflushall='undef' find='' @@ -530,6 +530,7 @@ installprefix='/opt/perl' installprefixexp='/opt/perl' installprivlib='/opt/perl/lib/5.7.0' installscript='/opt/perl/bin' +installscripts='define' installsitearch='/opt/perl/lib/site_perl/5.7.0/alpha-dec_osf-thread' installsitebin='/opt/perl/bin' installsitelib='/opt/perl/lib/site_perl/5.7.0' @@ -542,7 +543,7 @@ intsize='4' ivdformat='"ld"' ivsize='8' ivtype='long' -known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re' +known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Encode Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re' ksh='' ld='ld' lddlflags='-shared -expect_unresolved "*" -msym -std -s' @@ -634,6 +635,7 @@ path_sep=':' perl5='/u/vieraat/vieraat/jhi/Perl/bin/perl' perl='' perladmin='yourname@yourhost.yourplace.com' +perllibs='-lm -liconv -lutil -lpthread -lexc' perlpath='/opt/perl/bin/perl' pg='pg' phostname='' diff --git a/Porting/config_H b/Porting/config_H index 72134078af..a9fa6daef7 100644 --- a/Porting/config_H +++ b/Porting/config_H @@ -17,7 +17,7 @@ /* * Package name : perl5 * Source directory : /m/fs/work/work/permanent/perl/pp4/perl - * Configuration time: Fri Sep 8 23:45:25 EET DST 2000 + * Configuration time: Thu Oct 5 01:56:14 EET DST 2000 * Configured by : jhi * Target system : osf1 alpha.hut.fi v4.0 878 alpha */ diff --git a/epoc/config.sh b/epoc/config.sh index d9be3a7acc..a3b2872b35 100644 --- a/epoc/config.sh +++ b/epoc/config.sh @@ -494,6 +494,7 @@ installprivlib='/home/of/PERL/perl/lib/5.6.0/' installscript='/home/of/PERL/bin/' installsitearch='/home/of/PERL/site/lib/site_perl/5.6.0/epoc' installsitelib='/home/of/PERL/perl/lib/site_perl/5.6.0' +installscripts='define' installstyle='' installusrbinperl='undef' installvendorlib='' diff --git a/installperl b/installperl index c65af5afa9..b027d02705 100755 --- a/installperl +++ b/installperl @@ -364,26 +364,30 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) { chmod(0755, "$installbin/cppstdin"); } -# Install scripts. +if ($Config{installscripts} eq 'define') { + # Install scripts. -mkpath($installscript, $verbose, 0777); + mkpath($installscript, $verbose, 0777); -if (! $versiononly) { - for (@scripts) { - (my $base = $_) =~ s#.*/##; - copy($_, "$installscript/$base"); - chmod(0755, "$installscript/$base"); + if (! $versiononly) { + for (@scripts) { + (my $base = $_) =~ s#.*/##; + copy($_, "$installscript/$base"); + chmod(0755, "$installscript/$base"); + } } -} -# pstruct should be a link to c2ph - -if (! $versiononly) { - 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"); - } else { - link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); + # pstruct should be a link to c2ph + + if (! $versiononly) { + 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"); + } else { + link("$installscript/c2ph$scr_ext", + "$installscript/pstruct$scr_ext"); + } } } diff --git a/uconfig.sh b/uconfig.sh index 373db7771f..e5af70cb88 100755 --- a/uconfig.sh +++ b/uconfig.sh @@ -406,6 +406,7 @@ i_varargs='undef' i_varhdr='stdarg.h' i_vfork='undef' ignore_versioned_solibs='y' +installscripts='undef' installstyle='lib/perl5' installusrbinperl='undef' intsize='4' diff --git a/vos/config.def b/vos/config.def index cdb8f814f4..92b9dfb2dd 100644 --- a/vos/config.def +++ b/vos/config.def @@ -379,6 +379,7 @@ $i_varargs='undef' $i_vfork='undef' $Id='$Id' $inc_version_list_init='0' +$installscripts='define' $installusrbinperl='undef' $intsize='4' $ivdformat='"d"' diff --git a/win32/config.bc b/win32/config.bc index b617117238..055c1c0109 100644 --- a/win32/config.bc +++ b/win32/config.bc @@ -513,6 +513,7 @@ installhtmldir='~INST_TOP~~INST_VER~\html' installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp' installprivlib='~INST_TOP~~INST_VER~\lib' installscript='~INST_TOP~~INST_VER~\bin' +installscripts='define' installsitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~' installsitebin='~INST_TOP~~INST_VER~\bin~INST_ARCH~' installsitelib='~INST_TOP~\site~INST_VER~\lib' diff --git a/win32/config.gc b/win32/config.gc index 639be820f5..75b2921692 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -513,6 +513,7 @@ installhtmldir='~INST_TOP~~INST_VER~\html' installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp' installprivlib='~INST_TOP~~INST_VER~\lib' installscript='~INST_TOP~~INST_VER~\bin' +installscripts='define' installsitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~' installsitebin='~INST_TOP~~INST_VER~\bin~INST_ARCH~' installsitelib='~INST_TOP~\site~INST_VER~\lib' diff --git a/win32/config.vc b/win32/config.vc index 2dfe8301e7..3622a3a570 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -513,6 +513,7 @@ installhtmldir='~INST_TOP~~INST_VER~\html' installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp' installprivlib='~INST_TOP~~INST_VER~\lib' installscript='~INST_TOP~~INST_VER~\bin' +installscripts='define' installsitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~' installsitebin='~INST_TOP~~INST_VER~\bin~INST_ARCH~' installsitelib='~INST_TOP~\site~INST_VER~\lib' |