Regen Configure for the new *dir installation variables.

If these don't work, ask Schwern.

p4raw-id: //depot/perl@20410

1 files changed, 59 insertions, 69 deletions

diff --git a/Configure b/Configure
index 4157d439d4..c34d629ceb 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 Tue Jul  1 10:09:27 EEST 2003 [metaconfig 3.0 PL70]
+# Generated on Fri Aug  1 14:20:35 EEST 2003 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -1082,12 +1082,12 @@ installsitelib=''
 sitelib=''
 sitelib_stem=''
 sitelibexp=''
-installsiteman1=''
-siteman1=''
-siteman1exp=''
-installsiteman3=''
-siteman3=''
-siteman3exp=''
+installsiteman1dir=''
+siteman1dir=''
+siteman1direxp=''
+installsiteman3dir=''
+siteman3dir=''
+siteman3direxp=''
 siteprefix=''
 siteprefixexp=''
 installsitescript=''
@@ -1157,12 +1157,12 @@ installvendorlib=''
 vendorlib=''
 vendorlib_stem=''
 vendorlibexp=''
-installvendorman1=''
-vendorman1=''
-vendorman1exp=''
-installvendorman3=''
-vendorman3=''
-vendorman3exp=''
+installvendorman1dir=''
+vendorman1dir=''
+vendorman1direxp=''
+installvendorman3dir=''
+vendorman3dir=''
+vendorman3direxp=''
 usevendorprefix=''
 vendorprefix=''
 vendorprefixexp=''
@@ -1217,8 +1217,8 @@ locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
 : no include file wanted by default
 inclwanted=''
 
-siteman1=''
-siteman3=''
+siteman1dir=''
+siteman3dir=''
 sitescript=''
 : Trailing extension.  Override this in a hint file, if needed.
 : Extra object files, if any, needed on this platform.
@@ -8601,47 +8601,37 @@ else
 fi
 
 : determine where add-on manual pages go
-case "$siteman1" in
-'')	dflt=`echo "$man1dir" | $sed "s#^$prefix#$siteprefix#"` ;;
-*)	dflt=$siteman1 ;;
-esac
-case "$dflt" in
-''|' ') dflt=none ;;
+case "$siteman1dir" in
+'')	dflt=`echo $man1dir | $sed "s#^$prefix#$siteprefix#"` ;;
+*)  	dflt=$siteman1dir ;;
 esac
 fn=dn+~
 rp='Pathname where the site-specific manual pages should be installed?'
 . ./getfile
-siteman1="$ans"
-siteman1exp="$ansexp"
-: Use ' ' for none so value is preserved next time through Configure
-$test X"$siteman1" = "X" && siteman1=' '
+siteman1dir="$ans"
+siteman1direxp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installsiteman1=`echo "$siteman1exp" | $sed "s#^$prefix#$installprefix#"`
+	installsiteman1dir=`echo $siteman1direxp | $sed "s#^$prefix#$installprefix#"`
 else
-	installsiteman1="$siteman1exp"
+	installsiteman1dir="$siteman1direxp"
 fi
 
 : determine where add-on library man pages go
-case "$siteman3" in
-'')	dflt=`echo "$man3dir" | $sed "s#^$prefix#$siteprefix#"` ;;
-*)	dflt=$siteman3 ;;
-esac
-case "$dflt" in
-''|' ') dflt=none ;;
+case "$siteman3dir" in
+'')	dflt=`echo $man3dir | $sed "s#^$prefix#$siteprefix#"` ;;
+*)  	dflt=$siteman3dir ;;
 esac
 fn=dn+~
 rp='Pathname where the site-specific library manual pages should be installed?'
 . ./getfile
-siteman3="$ans"
-siteman3exp="$ansexp"
-: Use ' ' for none so value is preserved next time through Configure
-$test X"$siteman3" = "X" && siteman3=' '
+siteman3dir="$ans"
+siteman3direxp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installsiteman3=`echo "$siteman3exp" | $sed "s#^$prefix#$installprefix#"`
+	installsiteman3dir=`echo $siteman3direxp | $sed "s#^$prefix#$installprefix#"`
 else
-	installsiteman3="$siteman3exp"
+	installsiteman3dir="$siteman3direxp"
 fi
 
 : determine where add-on public executable scripts go
@@ -9020,13 +9010,13 @@ else
 fi
 
 case "$vendorprefix" in
-'')	vendorman1=''
-	vendorman1exp=''
+'')	vendorman1dir=''
+	vendorman1direxp=''
 	;;
 *)	: determine where vendor-supplied manual pages go.
-	case "$vendorman1" in
+	case "$vendorman1dir" in
 	'') dflt=`echo "$man1dir" | $sed "s#^$prefix#$vendorprefix#"` ;;
-	*)	dflt=$vendorman1 ;;
+	*)	dflt=$vendorman1dir ;;
 	esac
 	case "$dflt" in
 	''|' ') dflt=none ;;
@@ -9034,27 +9024,27 @@ case "$vendorprefix" in
 	fn=nd~+
 	rp='Pathname for the vendor-supplied manual section 1 pages?'
 	. ./getfile
-	vendorman1="$ans"
-	vendorman1exp="$ansexp"
+	vendorman1dir="$ans"
+	vendorman1direxp="$ansexp"
 	;;
 esac
 : Use ' ' for none so value is preserved next time through Configure
-$test X"$vendorman1" = "X" && vendorman1=' '
+$test X"$vendorman1dir" = "X" && vendorman1dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installvendorman1=`echo "$vendorman1exp" | $sed "s#^$prefix#$installprefix#"`
+	installvendorman1dir=`echo "$vendorman1direxp" | $sed "s#^$prefix#$installprefix#"`
 else
-	installvendorman1="$vendorman1exp"
+	installvendorman1dir="$vendorman1direxp"
 fi
 
 case "$vendorprefix" in
-'')	vendorman3=''
-	vendorman3exp=''
+'')	vendorman3dir=''
+	vendorman3direxp=''
 	;;
 *)	: determine where vendor-supplied module manual pages go.
-	case "$vendorman3" in
+	case "$vendorman3dir" in
 	'') dflt=`echo "$man3dir" | $sed "s#^$prefix#$vendorprefix#"` ;;
-	*)	dflt=$vendorman3 ;;
+	*)	dflt=$vendorman3dir ;;
 	esac
 	case "$dflt" in
 	''|' ') dflt=none ;;
@@ -9062,17 +9052,17 @@ case "$vendorprefix" in
 	fn=nd~+
 	rp='Pathname for the vendor-supplied manual section 3 pages?'
 	. ./getfile
-	vendorman3="$ans"
-	vendorman3exp="$ansexp"
+	vendorman3dir="$ans"
+	vendorman3direxp="$ansexp"
 	;;
 esac
 : Use ' ' for none so value is preserved next time through Configure
-$test X"$vendorman3" = "X" && vendorman3=' '
+$test X"$vendorman3dir" = "X" && vendorman3dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installvendorman3=`echo "$vendorman3exp" | $sed "s#^$prefix#$installprefix#"`
+	installvendorman3dir=`echo "$vendorman3direxp" | $sed "s#^$prefix#$installprefix#"`
 else
-	installvendorman3="$vendorman3exp"
+	installvendorman3dir="$vendorman3direxp"
 fi
 
 case "$vendorprefix" in
@@ -21086,8 +21076,8 @@ installsitebin='$installsitebin'
 installsitehtml1='$installsitehtml1'
 installsitehtml3='$installsitehtml3'
 installsitelib='$installsitelib'
-installsiteman1='$installsiteman1'
-installsiteman3='$installsiteman3'
+installsiteman1dir='$installsiteman1dir'
+installsiteman3dir='$installsiteman3dir'
 installsitescript='$installsitescript'
 installstyle='$installstyle'
 installusrbinperl='$installusrbinperl'
@@ -21096,8 +21086,8 @@ installvendorbin='$installvendorbin'
 installvendorhtml1='$installvendorhtml1'
 installvendorhtml3='$installvendorhtml3'
 installvendorlib='$installvendorlib'
-installvendorman1='$installvendorman1'
-installvendorman3='$installvendorman3'
+installvendorman1dir='$installvendorman1dir'
+installvendorman3dir='$installvendorman3dir'
 installvendorscript='$installvendorscript'
 intsize='$intsize'
 issymlink='$issymlink'
@@ -21285,10 +21275,10 @@ sitehtml3exp='$sitehtml3exp'
 sitelib='$sitelib'
 sitelib_stem='$sitelib_stem'
 sitelibexp='$sitelibexp'
-siteman1='$siteman1'
-siteman1exp='$siteman1exp'
-siteman3='$siteman3'
-siteman3exp='$siteman3exp'
+siteman1dir='$siteman1dir'
+siteman1direxp='$siteman1direxp'
+siteman3dir='$siteman3dir'
+siteman3direxp='$siteman3direxp'
 siteprefix='$siteprefix'
 siteprefixexp='$siteprefixexp'
 sitescript='$sitescript'
@@ -21395,10 +21385,10 @@ vendorhtml3exp='$vendorhtml3exp'
 vendorlib='$vendorlib'
 vendorlib_stem='$vendorlib_stem'
 vendorlibexp='$vendorlibexp'
-vendorman1='$vendorman1'
-vendorman1exp='$vendorman1exp'
-vendorman3='$vendorman3'
-vendorman3exp='$vendorman3exp'
+vendorman1dir='$vendorman1dir'
+vendorman1direxp='$vendorman1direxp'
+vendorman3dir='$vendorman3dir'
+vendorman3direxp='$vendorman3direxp'
 vendorprefix='$vendorprefix'
 vendorprefixexp='$vendorprefixexp'
 vendorscript='$vendorscript'