diff options
| author | Michael G Schwern <schwern@pobox.com> | 2000-03-05 01:31:29 -0500 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-03-05 22:05:54 +0000 |
| commit | 526fdc24ad2c51ba7f2a58c871a45d948bdfe8e3 (patch) | |
| tree | 4efbbea89f7bd201bb79bc04187ce371493229b3 /Configure | |
| parent | 7bf3502ff8e7c997421ba8258c4ee60453dd68b3 (diff) | |
| download | perl-526fdc24ad2c51ba7f2a58c871a45d948bdfe8e3.tar.gz | |
sitelib_stem and vendorlib_stem patches from Andy;
problem reported in
To: perl5-porters@perl.org
Subject: [ID 20000305.001] [BUG 5.5.670 perl.c] SITELIB_EXP mangled by hack.
Message-Id: <20000305113129.80DC23820@athens.arena-i.com>
p4raw-id: //depot/cfgperl@5559
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 48 |
1 files changed, 46 insertions, 2 deletions
@@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Sun Mar 5 19:11:56 EET 2000 [metaconfig 3.0 PL70] +# Generated on Sun Mar 5 23:53:58 EET 2000 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.com) cat >/tmp/c1$$ <<EOF @@ -864,6 +864,7 @@ sitebin='' sitebinexp='' installsitelib='' sitelib='' +sitelib_stem='' sitelibexp='' siteprefix='' siteprefixexp='' @@ -906,6 +907,10 @@ usethreads='' incpath='' mips_type='' usrinc='' +d_vendorarch='' +installvendorarch='' +vendorarch='' +vendorarchexp='' d_vendorbin='' installvendorbin='' vendorbin='' @@ -913,6 +918,7 @@ vendorbinexp='' d_vendorlib='' installvendorlib='' vendorlib='' +vendorlib_stem='' vendorlibexp='' usevendorprefix='' vendorprefix='' @@ -5314,6 +5320,7 @@ case "$vendorprefix" in vendorlibexp="$ansexp" ;; esac +vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"` : Change installation prefix, if necessary. if $test X"$prefix" != X"$installprefix"; then installvendorlib=`echo $vendorlibexp | $sed "s#^$prefix#$installprefix#"` @@ -5321,6 +5328,36 @@ else installvendorlib="$vendorlibexp" fi +case "$vendorprefix" in +'') d_vendorarch="$undef" + vendorarch='' + vendorarchexp='' + ;; +*) d_vendorarch="$define" + : determine where vendor-supplied architecture-dependent libraries go. + : vendorlib default is /usr/local/lib/perl5/vendor_perl/$version + : vendorarch default is /usr/local/lib/perl5/vendor_perl/$version/$archname + : vendorlib may have an optional trailing /share. + case "$vendorarch" in + '') dflt=`echo $vendorlib | $sed 's,/share$,,'` + dflt="$dflt/$archname" + ;; + *) dflt="$vendorarch" ;; + esac + fn=d~+ + rp='Pathname for vendor-supplied architecture-dependent files?' + . ./getfile + vendorarch="$ans" + vendorarchexp="$ansexp" + ;; +esac +: Change installation prefix, if necessary. +if $test X"$prefix" != X"$installprefix"; then + installvendorarch=`echo $vendorarchexp | sed "s#^$prefix#$installprefix#"` +else + installvendorarch="$vendorarchexp" +fi + : Cruising for prototypes echo " " echo "Checking out function prototypes..." >&4 @@ -5467,6 +5504,7 @@ rp='Pathname for the site-specific library files?' . ./getfile sitelib="$ans" sitelibexp="$ansexp" +sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"` : Change installation prefix, if necessary. if $test X"$prefix" != X"$installprefix"; then installsitelib=`echo $sitelibexp | $sed "s#^$prefix#$installprefix#"` @@ -5573,7 +5611,7 @@ $rm -f getverlist echo " " if $test -d /usr/bin -a "X$installbin" != X/usr/bin; then $cat <<EOM -Many scripts expect to perl to be installed as /usr/bin/perl. +Many scripts expect perl to be installed as /usr/bin/perl. I can install the perl you are about to compile also as /usr/bin/perl (in addition to $installbin/perl). EOM @@ -15245,6 +15283,7 @@ d_umask='$d_umask' d_uname='$d_uname' d_union_semun='$d_union_semun' d_ustat='$d_ustat' +d_vendorarch='$d_vendorarch' d_vendorbin='$d_vendorbin' d_vendorlib='$d_vendorlib' d_vfork='$d_vfork' @@ -15406,6 +15445,7 @@ installsitebin='$installsitebin' installsitelib='$installsitelib' installstyle='$installstyle' installusrbinperl='$installusrbinperl' +installvendorarch='$installvendorarch' installvendorbin='$installvendorbin' installvendorlib='$installvendorlib' intsize='$intsize' @@ -15561,6 +15601,7 @@ sitearchexp='$sitearchexp' sitebin='$sitebin' sitebinexp='$sitebinexp' sitelib='$sitelib' +sitelib_stem='$sitelib_stem' sitelibexp='$sitelibexp' siteprefix='$siteprefix' siteprefixexp='$siteprefixexp' @@ -15645,9 +15686,12 @@ uvsize='$uvsize' uvtype='$uvtype' uvuformat='$uvuformat' uvxformat='$uvxformat' +vendorarch='$vendorarch' +vendorarchexp='$vendorarchexp' vendorbin='$vendorbin' vendorbinexp='$vendorbinexp' vendorlib='$vendorlib' +vendorlib_stem='$vendorlib_stem' vendorlibexp='$vendorlibexp' vendorprefix='$vendorprefix' vendorprefixexp='$vendorprefixexp' |