Change 13835 by jhi@alpha on 2001/12/21 19:47:03
Further VOS tweaks: the _exe needs to be introduced
in the very beginning, and the make/gmake needs special
VOS logic.
Affected files ...
.... //depot/perl/Configure#377 edit
.... //depot/perl/Makefile.SH#218 edit
Differences ...
==== //depot/perl/Configure#377 (xtext) ====
Index: perl/Configure
--- perl/Configure.~1~ Fri Dec 21 13:00:05 2001
+++ perl/Configure Fri Dec 21 13:00:05 2001
@@ -20,7 +20,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Fri Dec 21 17:46:40 EET 2001 [metaconfig 3.0 PL70]
+# Generated on Fri Dec 21 20:17:57 EET 2001 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by [EMAIL PROTECTED])
cat >c1$$ <<EOF
@@ -165,6 +165,12 @@
test -d UU || mkdir UU
cd UU && rm -f ./*
+if test -f "/system/gnu_library/bin/ar.pm"; then
+ _exe=".pm"
+else
+ _exe=""
+fi
+
ccname=''
ccversion=''
ccsymbols=''
@@ -1044,7 +1050,6 @@
: set useopcode=false in your hint file to disable the Opcode extension.
useopcode=true
: Trailing extension. Override this in a hint file, if needed.
-_exe=''
: Extra object files, if any, needed on this platform.
archobjs=''
archname=''
@@ -2075,6 +2080,7 @@
csh
date
egrep
+gmake
gzip
less
ln
@@ -2152,19 +2158,28 @@
esac
done
case "$egrep" in
-egrep$_exe)
+egrep)
echo "Substituting grep for egrep."
egrep=$grep
;;
esac
case "$ln" in
-ln$_exe)
+ln)
echo "Substituting cp for ln."
ln=$cp
;;
esac
case "$make$gmake" in
-*make$_exe)
+*/gmake|?:[\\/]gmake)
+ # We can't have osname yet.
+ if test -f "/system/gnu_library/bin/ar.pm"; then # Stratus VOS
+ # Assume that gmake, if found, is definitely GNU make
+ # and prefer it over the system make.
+ echo "Substituting gmake for make."
+ make=$gmake
+ fi
+ ;;
+*/make|?:[\\/]make)
;;
*)
echo "I can't find make or gmake, and my life depends on it." >&4
@@ -4141,7 +4156,7 @@
: or the new name.
case "$_exe" in
'') case "$exe_ext" in
- '') ;;
+ '') ;;
*) _exe="$exe_ext" ;;
esac
;;
==== //depot/perl/Makefile.SH#218 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH.~1~ Fri Dec 21 13:00:05 2001
+++ perl/Makefile.SH Fri Dec 21 13:00:05 2001
@@ -198,6 +198,8 @@
# do it for you.
$make_set_make
+# Mention $gmake here so it gets probed for by Configure.
+
# These variables may need to be manually set for non-Unix systems.
AR = $full_ar
EXE_EXT = $_exe
End of Patch.
