From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 1 Aug 2003 10:37:09 +0000 (+0000)
Subject: Regen Configure to use the *html*dir files.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8d2cbf275bdbe423a78c055275f6608f68d8afad;p=p5sagit%2Fp5-mst-13.2.git

Regen Configure to use the *html*dir files.
(installhtml uses none of that, though)

p4raw-id: //depot/perl@20413
---

diff --git a/Configure b/Configure
index c34d629..10f8167 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 Fri Aug  1 14:20:35 EEST 2003 [metaconfig 3.0 PL70]
+# Generated on Fri Aug  1 14:45:20 EEST 2003 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -1072,12 +1072,12 @@ sitearchexp=''
 installsitebin=''
 sitebin=''
 sitebinexp=''
-installsitehtml1=''
-sitehtml1=''
-sitehtml1exp=''
-installsitehtml3=''
-sitehtml3=''
-sitehtml3exp=''
+installsitehtml1dir=''
+sitehtml1dir=''
+sitehtml1direxp=''
+installsitehtml3dir=''
+sitehtml3dir=''
+sitehtml3direxp=''
 installsitelib=''
 sitelib=''
 sitelib_stem=''
@@ -1146,12 +1146,12 @@ d_vendorbin=''
 installvendorbin=''
 vendorbin=''
 vendorbinexp=''
-installvendorhtml1=''
-vendorhtml1=''
-vendorhtml1exp=''
-installvendorhtml3=''
-vendorhtml3=''
-vendorhtml3exp=''
+installvendorhtml1dir=''
+vendorhtml1dir=''
+vendorhtml1direxp=''
+installvendorhtml3dir=''
+vendorhtml3dir=''
+vendorhtml3direxp=''
 d_vendorlib=''
 installvendorlib=''
 vendorlib=''
@@ -8553,11 +8553,11 @@ else
 fi
 
 : determine where add-on html pages go
-: There is no standard location, so try to copy the previously-selected 
+: There is no standard location, so try to copy the previously-selected
 : directory structure for the core html pages.
-case "$sitehtml1" in
-'')	dflt=`echo "$html1dir" | $sed "s#^$prefix#$siteprefix#"` ;;
-*)	dflt=$sitehtml1 ;;
+case "$sitehtml1dir" in
+'')    dflt=`echo "$html1dir" | $sed "s#^$prefix#$siteprefix#"` ;;
+*)     dflt=$sitehtml1dir ;;
 esac
 case "$dflt" in
 ''|' ') dflt=none ;;
@@ -8565,23 +8565,21 @@ esac
 fn=dn+~
 rp='Pathname where the site-specific html pages should be installed?'
 . ./getfile
-sitehtml1="$ans"
-sitehtml1exp="$ansexp"
-: Use ' ' for none so value is preserved next time through Configure
-$test X"$sitehtml1" = "X" && sitehtml1=' '
+sitehtml1dir="$ans"
+sitehtml1direxp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installsitehtml1=`echo "$sitehtml1exp" | $sed "s#^$prefix#$installprefix#"`
+	installsitehtml1dir=`echo $sitehtml1direxp | $sed "s#^$prefix#$installprefix#"`
 else
-	installsitehtml1="$sitehtml1exp"
+	installsitehtml1dir="$sitehtml1direxp"
 fi
 
 : determine where add-on library html pages go
 : There is no standard location, so try to copy the previously-selected
 : directory structure for the core html pages.
-case "$sitehtml3" in
-'')	dflt=`echo "$html3dir" | $sed "s#^$prefix#$siteprefix#"` ;;
-*)	dflt=$sitehtml3 ;;
+case "$sitehtml3dir" in
+'')    dflt=`echo "$html3dir" | $sed "s#^$prefix#$siteprefix#"` ;;
+*)     dflt=$sitehtml3dir ;;
 esac
 case "$dflt" in
 ''|' ') dflt=none ;;
@@ -8589,15 +8587,13 @@ esac
 fn=dn+~
 rp='Pathname where the site-specific library html pages should be installed?'
 . ./getfile
-sitehtml3="$ans"
-sitehtml3exp="$ansexp"
-: Use ' ' for none so value is preserved next time through Configure
-$test X"$sitehtml3" = "X" && sitehtml3=' '
+sitehtml3dir="$ans"
+sitehtml3direxp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installsitehtml3=`echo "$sitehtml3exp" | $sed "s#^$prefix#$installprefix#"`
+	installsitehtml3dir=`echo $sitehtml3direxp | $sed "s#^$prefix#$installprefix#"`
 else
-	installsitehtml3="$sitehtml3exp"
+	installsitehtml3dir="$sitehtml3direxp"
 fi
 
 : determine where add-on manual pages go
@@ -8948,16 +8944,16 @@ else
 fi
 
 case "$vendorprefix" in
-'')	vendorhtml1=''
-	vendorhtml1exp=''
+'')	vendorhtml1dir=''
+	vendorhtml1direxp=''
 	;;
 *)	: determine where vendor-supplied html pages go.
 	: There is no standard location, so try to copy the previously-selected
 	: directory structure for the core html pages.
 	: XXX Better default suggestions would be welcome.
-	case "$vendorhtml1" in
+	case "$vendorhtml1dir" in
 	'')	dflt=`echo "$html1dir" | $sed "s#^$prefix#$vendorprefix#"` ;;
-	*)	dflt=$vendorhtml1 ;;
+	*)	dflt=$vendorhtml1dir ;;
 	esac
 	case "$dflt" in
 	''|' ') dflt=none ;;
@@ -8965,30 +8961,30 @@ case "$vendorprefix" in
 	fn=dn+~
 	rp='Pathname for the vendor-supplied html pages?'
 	. ./getfile
-	vendorhtml1="$ans"
-	vendorhtml1exp="$ansexp"
+	vendorhtml1dir="$ans"
+	vendorhtml1direxp="$ansexp"
 	;;
 esac
 : Use ' ' for none so value is preserved next time through Configure
-$test X"$vendorhtml1" = "X" && vendorhtml1=' '
+$test X"$vendorhtml1dir" = "X" && vendorhtml1dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installvendorhtml1=`echo $vendorhtml1exp | $sed "s#^$prefix#$installprefix#"`
+	installvendorhtml1dir=`echo $vendorhtml1direxp | $sed "s#^$prefix#$installprefix#"`
 else
-	installvendorhtml1="$vendorhtml1exp"
+	installvendorhtml1dir="$vendorhtml1direxp"
 fi
 
 case "$vendorprefix" in
-'')	vendorhtml3=''
-	vendorhtml3exp=''
+'')	vendorhtml3dir=''
+	vendorhtml3direxp=''
 	;;
 *)	: determine where vendor-supplied module html pages go.
 	: There is no standard location, so try to copy the previously-selected
 	: directory structure for the core html pages.
 	: XXX Better default suggestions would be welcome.
-	case "$vendorhtml3" in
+	case "$vendorhtml3dir" in
 	'')	dflt=`echo "$html3dir" | $sed "s#^$prefix#$vendorprefix#"` ;;
-	*)	dflt=$vendorhtml3 ;;
+	*)	dflt=$vendorhtml3dir ;;
 	esac
 	case "$dflt" in
 	''|' ') dflt=none ;;
@@ -8996,17 +8992,17 @@ case "$vendorprefix" in
 	fn=dn+~
 	rp='Pathname for the vendor-supplied html pages?'
 	. ./getfile
-	vendorhtml3="$ans"
-	vendorhtml3exp="$ansexp"
+	vendorhtml3dir="$ans"
+	vendorhtml3direxp="$ansexp"
 	;;
 esac
 : Use ' ' for none so value is preserved next time through Configure
-$test X"$vendorhtml3" = "X" && vendorhtml3=' '
+$test X"$vendorhtml3dir" = "X" && vendorhtml3dir=' '
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installvendorhtml3=`echo $vendorhtml3exp | $sed "s#^$prefix#$installprefix#"`
+	installvendorhtml3dir=`echo $vendorhtml3direxp | $sed "s#^$prefix#$installprefix#"`
 else
-	installvendorhtml3="$vendorhtml3exp"
+	installvendorhtml3dir="$vendorhtml3direxp"
 fi
 
 case "$vendorprefix" in
@@ -21073,8 +21069,8 @@ installprivlib='$installprivlib'
 installscript='$installscript'
 installsitearch='$installsitearch'
 installsitebin='$installsitebin'
-installsitehtml1='$installsitehtml1'
-installsitehtml3='$installsitehtml3'
+installsitehtml1dir='$installsitehtml1dir'
+installsitehtml3dir='$installsitehtml3dir'
 installsitelib='$installsitelib'
 installsiteman1dir='$installsiteman1dir'
 installsiteman3dir='$installsiteman3dir'
@@ -21083,8 +21079,8 @@ installstyle='$installstyle'
 installusrbinperl='$installusrbinperl'
 installvendorarch='$installvendorarch'
 installvendorbin='$installvendorbin'
-installvendorhtml1='$installvendorhtml1'
-installvendorhtml3='$installvendorhtml3'
+installvendorhtml1dir='$installvendorhtml1dir'
+installvendorhtml3dir='$installvendorhtml3dir'
 installvendorlib='$installvendorlib'
 installvendorman1dir='$installvendorman1dir'
 installvendorman3dir='$installvendorman3dir'
@@ -21268,10 +21264,10 @@ sitearch='$sitearch'
 sitearchexp='$sitearchexp'
 sitebin='$sitebin'
 sitebinexp='$sitebinexp'
-sitehtml1='$sitehtml1'
-sitehtml1exp='$sitehtml1exp'
-sitehtml3='$sitehtml3'
-sitehtml3exp='$sitehtml3exp'
+sitehtml1dir='$sitehtml1dir'
+sitehtml1direxp='$sitehtml1direxp'
+sitehtml3dir='$sitehtml3dir'
+sitehtml3direxp='$sitehtml3direxp'
 sitelib='$sitelib'
 sitelib_stem='$sitelib_stem'
 sitelibexp='$sitelibexp'
@@ -21378,10 +21374,10 @@ vendorarch='$vendorarch'
 vendorarchexp='$vendorarchexp'
 vendorbin='$vendorbin'
 vendorbinexp='$vendorbinexp'
-vendorhtml1='$vendorhtml1'
-vendorhtml1exp='$vendorhtml1exp'
-vendorhtml3='$vendorhtml3'
-vendorhtml3exp='$vendorhtml3exp'
+vendorhtml1dir='$vendorhtml1dir'
+vendorhtml1direxp='$vendorhtml1direxp'
+vendorhtml3dir='$vendorhtml3dir'
+vendorhtml3direxp='$vendorhtml3direxp'
 vendorlib='$vendorlib'
 vendorlib_stem='$vendorlib_stem'
 vendorlibexp='$vendorlibexp'
diff --git a/Policy_sh.SH b/Policy_sh.SH
index 3cb6375..a618d23 100644
--- a/Policy_sh.SH
+++ b/Policy_sh.SH
@@ -125,16 +125,16 @@ esac
 #   $bin $scriptdir $privlib $archlib 
 #	$man1dir $man3dir $html1dir $html3dir 
 #   $sitebin $sitescript $sitelib $sitearch 
-#	$siteman1dir $siteman3dir $sitehtml1 $sitehtml3
+#	$siteman1dir $siteman3dir $sitehtml1dir $sitehtml3dir
 #   $vendorbin $vendorscript $vendorlib $vendorarch
-#	$vendorman1dir $vendorman3dir $vendorhtml1 $vendorhtml3
+#	$vendorman1dir $vendorman3dir $vendorhtml1dir $vendorhtml3dir
 
 for var in \
 	bin scriptdir privlib archlib man1dir man3dir html1dir html3dir \
 	sitebin sitescript sitelib sitearch \
-		siteman1dir siteman3dir sitehtml1 sitehtml3 \
+		siteman1dir siteman3dir sitehtml1dir sitehtml3dir \
 	vendorbin vendorscript vendorlib vendorarch \
-		vendorman1dir vendorman3dir vendorhtml1 vendorhtml3
+		vendorman1dir vendorman3dir vendorhtml1dir vendorhtml3dir
 do
 	
     case "$var" in