(prefix, exec_prefix): Set these from @...@.

(CPPFLAGS): New variable, set from @CPPFLAGS@.
(compiling loop): Pass $CPPFLAGS before $CFLAGS.

diff --git a/build.sh.in b/build.sh.in
index 60d60d2..b789c62 100644 (file)
--- a/build.sh.in
+++ b/build.sh.in
@@ -2,7 +2,7 @@
 
 # Shell script to build GNU Make in the absence of any `make' program.
 
-# Copyright (C) 1993 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 # 
 # GNU Make is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 srcdir='@srcdir@'
 CC='@CC@'
 CFLAGS='@CFLAGS@'
+CPPFLAGS='@CPPFLAGS@'
 LDFLAGS='@LDFLAGS@'
 defines='@DEFS@ -DLIBDIR="${libdir}" -DINCLUDEDIR="${includedir}"'
 ALLOCA='@ALLOCA@'
@@ -32,10 +33,10 @@ extras='@LIBOBJS@'
 REMOTE='@REMOTE@'
 
 # Common prefix for machine-independent installed files.
-prefix=/usr/local
+prefix=@prefix@
 # Common prefix for machine-dependent installed files.
-exec_prefix=/usr/local
-# Directory to find libraries in for `-lXXX'.
+exec_prefix=@exec_prefix@
+# Directory to find libraries in for `-lLIB'.
 libdir=${exec_prefix}/lib
 # Directory to search by default for included makefiles.
 includedir=${prefix}/include
@@ -49,7 +50,8 @@ objs="commands.o job.o dir.o file.o misc.o main.o read.o remake.o rule.o implici
 # Compile the source files into those objects.
 for file in `echo ${objs} | sed 's/\.o/.c/g'`; do
   echo compiling ${file}...
-  $CC $CFLAGS $defines -c -I. -I${srcdir} -I${srcdir}/glob ${srcdir}/$file
+  $CC $CPPFLAGS $CFLAGS $defines -c \
+      -I. -I${srcdir} -I${srcdir}/glob ${srcdir}/$file
 done
 
 # The object files were actually all put in the current directory.