randy 98/12/09 13:26:20
Modified: src Configure
src/helpers TestCompile
Log:
Fix a rare case where our use of 'make' would fail or yield bogus
results if Configure was called from a Makefile shell. Default to 'make'
if MAKE is not in the enviroment.
Revision Changes Path
1.311 +8 -1 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- Configure 1998/12/06 16:14:17 1.310
+++ Configure 1998/12/09 21:26:14 1.311
@@ -744,6 +744,13 @@
esac
####################################################################
+## set this if we haven't
+##
+if [ ".${MAKE}" = . ]; then
+ MAKE='make'; export MAKE
+fi
+
+####################################################################
## Show user what OS we came up with
##
echo " + configured for $OS platform"
@@ -1725,7 +1732,7 @@
## it uses ugly looking built-in directory walk messages
## while we are already using our own messages
##
-if [ "x`make -v 2>/dev/null | grep 'GNU Make'`" = "x" ]; then
+if [ "x`${MAKE} -v 2>/dev/null | grep 'GNU Make'`" = "x" ]; then
MFLAGS_STATIC=
else
MFLAGS_STATIC=--no-print-directory
1.22 +1 -1 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===================================================================
RCS file: /home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TestCompile 1998/12/03 01:03:46 1.21
+++ TestCompile 1998/12/09 21:26:19 1.22
@@ -143,7 +143,7 @@
EOF
# Now run that Makefile
-eval "make $TARGET >/dev/null $ERRDIR"
+eval "${MAKE} ${TARGET} >/dev/null $ERRDIR"
# And see if dummy exists and is executable, if so, then we
# assume the condition we are testing for is good
