Configure patches -01 and -02 for 5.004_61.

p4raw-id: //depot/perl@783

1 files changed, 54 insertions, 12 deletions

diff --git a/Policy_sh.SH b/Policy_sh.SH
index 831585422a..1f84d7a332 100644
--- a/Policy_sh.SH
+++ b/Policy_sh.SH
@@ -7,7 +7,9 @@ $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.
+#  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.
 #
 #  The idea here is to distill in one place the common site-wide
 #  "policy" answers (such as installation directories) that are
@@ -38,8 +40,6 @@ perladmin='$perladmin'
 # installprivlib is for systems (such as those running AFS) that
 #     need to distinguish between the place where things
 #     get installed and where they finally will reside.
-# A full Glossary of all these config.sh variables is in the
-# Porting/Glossary file.
 
 # Installation Prefix.
 prefix='$prefix'
@@ -53,12 +53,6 @@ installscript='$installscript'
 privlib='$privlib'
 installprivlib='$installprivlib'
 
-archlib='$archlib'
-installarchlib='$installarchlib'
-
-sitearch='$sitearch'
-installsitearch='$installsitearch'
-
 sitelib='$sitelib'
 installsitelib='$installsitelib'
 
@@ -70,8 +64,56 @@ man3dir='$man3dir'
 man3ext='$man3ext'
 installman3dir='$installman3dir'
 
-#  You may add additional items here, for example, to set the pager
-#  to your local favorite value, uncomment
-#  #pager='$pager'
+# NOTE:  Be careful about architecture-dependent names.  If you have
+# accepted the default, the following definitions will be commented out.
+# That way you can carry this file to another architecture and this file
+# won't mistakenly set architecture-dependent names to the wrong value.
+#
+# If you have not accepted the default, then be sure to check the
+# following lines before copying this file to another system.
+
+!GROK!THIS!
+
+if test 0 -eq "$subversion"; then
+    version=`LC_ALL=C; export LC_ALL; \
+    echo $baserev $patchlevel | 
+	$awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
+else
+    version=`LC_ALL=C; export LC_ALL; \
+	echo $baserev $patchlevel $subversion | \
+	$awk '{ printf "%.5f\n", $1 + $2/1000.0 + $3/100000.0 }'`
+fi
+
+dflt="$privlib/$archname/$version"
+if test X"$archlib" = X"$dflt"; then
+    echo "# archlib='$archlib'"
+    echo "# installarchlib='$installarchlib'"
+else
+    echo '# NOTE:  Preserving your custom archlib.'
+    echo "archlib='$archlib'"
+    echo "installarchlib='$installarchlib'"
+fi >> Policy.sh
+echo >> Policy.sh
+
+# Now consider sitearch.
+dflt="$sitelib/$archname"
+if test X"$sitearch" = X"$dflt"; then
+    echo "# sitearch='$sitearch'"
+    echo "# installsitearch='$installsitearch'"
+else
+    echo '# NOTE:  Preserving your custom sitearch.'
+    echo "sitearch='$sitearch'"
+    echo "installsitearch='$installsitearch'"
+fi >> Policy.sh
+
+$spitshell <<!GROK!THIS! >>Policy.sh
+
+#  Lastly, you may add additional items here.  For example, to set the 
+#  pager to your local favorite value, uncomment the following line in
+#  the original Policy_sh.SH file and re-run   sh Policy_sh.SH.
+# $pager='$pager'
+#
+#  A full Glossary of all the config.sh variables is in the file
+#  Porting/Glossary.
 
 !GROK!THIS!