X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Policy_sh.SH;h=a618d23d56957a28172406c2d0c34e689d410cb3;hb=9e5bbba0de25c01ae9355c7a97e237602a37e9f3;hp=0d9c1dfbc758c2ee07267e354f4b249198c34a96;hpb=49c10eea37fecdc3f701b564ab530e9176f545c4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Policy_sh.SH b/Policy_sh.SH
index 0d9c1df..a618d23 100644
--- a/Policy_sh.SH
+++ b/Policy_sh.SH
@@ -1,4 +1,4 @@
-case $CONFIGDOTSH in
+case $PERL_CONFIG_SH in
 '') . ./config.sh ;;
 esac
 echo "Extracting Policy.sh (with variable substitutions)"
@@ -7,18 +7,33 @@ $startsh
 #
 #  This file was produced by running the Policy_sh.SH script, which
 #  gets its values from config.sh, which is generally produced by
-#  running Configure.  The Policy.sh file gets overwritten each time
-#  Configure is run.  Any variables you add to Policy.sh will be lost
-#  unless you copy Policy.sh somewhere else before running Configure.
+#  running Configure.  
 #
 #  The idea here is to distill in one place the common site-wide
 #  "policy" answers (such as installation directories) that are
 #  to be "sticky".  If you keep the file Policy.sh around in
 #  the same directory as you are building Perl, then Configure will
 #  (by default) load up the Policy.sh file just before the
-#  platform-specific hints file.
+#  platform-specific hints file and rewrite it at the end.
+#
+#   The sequence of events is as follows:
+#   A:  If you are NOT re-using an old config.sh:
+#   1.  At start-up, Configure loads up the defaults from the
+#	os-specific  hints/osname_osvers.sh file and any previous
+#	Policy.sh file.
+#   2.  At the end, Configure runs Policy_sh.SH, which creates
+#	Policy.sh, overwriting a previous Policy.sh if necessary.
+#
+#   B: If you are re-using an old config.sh:
+#   1.  At start-up, Configure loads up the defaults from config.sh, 
+#	ignoring any previous Policy.sh file.
+#   2.  At the end, Configure runs Policy_sh.SH, which creates
+#	Policy.sh, overwriting a previous Policy.sh if necessary.
+#
+#  Thus the Policy.sh file gets overwritten each time
+#  Configure is run.  Any variables you add to Policy.sh will be lost
+#  unless you copy Policy.sh somewhere else before running Configure.
 #
-
 #  Allow Configure command-line overrides; usually these won't be
 #  needed, but something like -Dprefix=/test/location can be quite
 #  useful for testing out new versions.
@@ -37,16 +52,37 @@ esac
 case "\$prefix" in
 '') prefix='$prefix' ;;
 esac
+
+# By default, the next three are the same as \$prefix.  
+# If the user changes \$prefix, and previously \$siteprefix was the
+# same as \$prefix, then change \$siteprefix as well.
+# Use similar logic for \$vendorprefix and \$installprefix.
+
 case "\$siteprefix" in
-'') siteprefix='$siteprefix' ;;
+'') if test "$siteprefix" = "$prefix"; then
+	siteprefix="\$prefix"
+    else
+	siteprefix='$siteprefix'
+    fi
+    ;;
 esac
 case "\$vendorprefix" in
-'') vendorprefix='$vendorprefix' ;;
+'') if test "$vendorprefix" = "$prefix"; then
+	vendorprefix="\$prefix"
+    else
+	vendorprefix='$vendorprefix'
+    fi
+    ;;
 esac
 
 # Where installperl puts things.
 case "\$installprefix" in
-'') installprefix='$installprefix' ;;
+'') if test "$installprefix" = "$prefix"; then
+	installprefix="\$prefix"
+    else
+	installprefix='$installprefix'
+    fi
+    ;;
 esac
 
 # Installation directives.  Note that each one comes in three flavors.
@@ -84,12 +120,21 @@ esac
 
 !GROK!THIS!
 
+# Set the following variables.  Mention them here so metaconfig
+# includes the appropriate code in Configure
+#   $bin $scriptdir $privlib $archlib 
+#	$man1dir $man3dir $html1dir $html3dir 
+#   $sitebin $sitescript $sitelib $sitearch 
+#	$siteman1dir $siteman3dir $sitehtml1dir $sitehtml3dir
+#   $vendorbin $vendorscript $vendorlib $vendorarch
+#	$vendorman1dir $vendorman3dir $vendorhtml1dir $vendorhtml3dir
+
 for var in \
 	bin scriptdir privlib archlib man1dir man3dir html1dir html3dir \
 	sitebin sitescript sitelib sitearch \
-		siteman1 siteman3 sitehtml1 sitehtml3 \
+		siteman1dir siteman3dir sitehtml1dir sitehtml3dir \
 	vendorbin vendorscript vendorlib vendorarch \
-		vendorman1 vendorman3 vendorhtml1 vendorhtml3
+		vendorman1dir vendorman3dir vendorhtml1dir vendorhtml3dir
 do
 	
     case "$var" in