In accordance with (metaconfig) change #3737.

p4raw-link: @3737 on //depot/cfgperl: 6b10942b0e5eb7a4fa6e27f98c05fb5c02177516

p4raw-id: //depot/metaconfig@3738

diff --git a/U/installdirs/sitelib.U b/U/installdirs/sitelib.U
index 8ba77ed..7fa3edf 100644 (file)
--- a/U/installdirs/sitelib.U
+++ b/U/installdirs/sitelib.U
@@ -60,7 +60,7 @@
 ?X: remove any trailing -3.0 or other version identification
 prog=`echo $package | $sed 's/-*[0-9.]*$//'`
 case "$installstyle" in
-*lib/perl5*) dflt=$siteprefix/lib/site_$prog/ ;;
+*lib/perl5*) dflt=$siteprefix/lib/site_$prog ;;
 *)      dflt=$siteprefix/lib/site_$prog ;;
 esac
 $cat <<EOM

diff --git a/U/installdirs/vendorprefix.U b/U/installdirs/vendorprefix.U
index 5464487..8e804dc 100644 (file)
--- a/U/installdirs/vendorprefix.U
+++ b/U/installdirs/vendorprefix.U
@@ -12,7 +12,8 @@
 ?RCS: Revision 1.1  1999/07/08 18:32:57  doughera
 ?RCS: Initial revision
 ?RCS:
-?MAKE:vendorprefix vendorprefixexp +oldvendorprefix: Getfile Loc Oldconfig cat prefix
+?MAKE:usevendorprefix vendorprefix vendorprefixexp +oldvendorprefix: \
+       Getfile Loc Oldconfig cat prefix
 ?MAKE: -pick add $@ %<
 ?S:vendorprefix:
 ?S:    This variable holds the full absolute path of the directory below
@@ -34,32 +35,45 @@ may find it convenient to place all vendor-supplied files in this
 directory rather than in the main distribution directory.  This will
 ease upgrades between binary-compatible maintenance versions of perl.
 
-The default answer (empty) should be fine for most people.
-This causes further questions about vendor add-ons to be skipped
-and no vendor-specific directories will be configured for perl.
-
 Of course you may also use these directories in whatever way you see
 fit.  For example, you might use them to access modules shared over a
 company-wide network.
 
+The default answer should be fine for most people.
+This causes further questions about vendor add-ons to be skipped
+and no vendor-specific directories will be configured for perl.
+
 EOM
-fn=d~+
-rp='Installation prefix to use for vendor-supplied add-ons?'
-case "$vendorprefix" in
-'') dflt='' ;;
-*)  dflt=$vendorprefix ;;
+rp='Do you want to configure vendor-specific add-on directories?'
+case "$usevendorprefix" in
+define|true|[yY]*) dflt=y ;;
+*) dflt=n ;;
 esac
-. ./getfile
-oldvendorprefix=''
-case "$vendorprefix" in
-'') ;;
-*)
-       case "$ans" in
-       "$prefix") ;;
-       *) oldvendorprefix="$prefix";;
+. ./myread
+case "$ans" in
+[yY]*) fn=d~+
+       rp='Installation prefix to use for vendor-supplied add-ons?'
+       case "$vendorprefix" in
+       '') dflt='' ;;
+       *)  dflt=$vendorprefix ;;
        esac
+       . ./getfile
+       oldvendorprefix=''
+       case "$vendorprefix" in
+       '') ;;
+       *)      case "$ans" in
+               "$prefix") ;;
+               *) oldvendorprefix="$prefix";;
+               esac
+               ;;
+       esac
+       usevendorprefix="$define"
+       vendorprefix="$ans"
+       vendorprefixexp="$ansexp"
+       ;;
+*)     usevendorprefix="$undef"
+       vendorprefix=''
+       vendorprefixexp=''
        ;;
 esac
-vendorprefix="$ans"
-vendorprefixexp="$ansexp"
 

diff --git a/U/modified/Oldconfig.U b/U/modified/Oldconfig.U
index 5ad985d..ed37788 100644 (file)
--- a/U/modified/Oldconfig.U
+++ b/U/modified/Oldconfig.U
@@ -514,7 +514,7 @@ EOM
 
 You may give one or more space-separated answers, or "none" if appropriate.
 A well-behaved OS will have no hints, so answering "none" or just "Policy"
-is a good thing.  DO NOT give a wrong version.
+is a good thing.  DO NOT give a wrong version or a wrong OS.
 
 EOM
 

diff --git a/U/perl/Extensions.U b/U/perl/Extensions.U
index 419355d..7b07454 100644 (file)
--- a/U/perl/Extensions.U
+++ b/U/perl/Extensions.U
@@ -90,7 +90,7 @@ find_extensions='
     done'
 tdir=`pwd`
 cd $rsrc/ext
-set
+set X
 shift
 eval $find_extensions
 set X $nonxs_extensions