(CPPFLAGS): New variable.

(prefix, exec_prefix): Set from @...@.
(compilation loop): Pass $CPPFLAGS to compiler.

diff --git a/build.template b/build.template
index 6bae5b29fa197b00c9c4cdf53742ec97a5d462c6..1e65ac58c7b717c34c6ad20ea0526ab2ef54f0b1 100644 (file)
--- a/build.template
+++ b/build.template
@@ -1,8 +1,8 @@
 #!/bin/sh
-
 # Shell script to build GNU Make in the absence of any `make' program.
+# @configure_input@
 
-# 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,9 +33,9 @@ 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
+exec_prefix='@exec_prefix@'
 # Directory to find libraries in for `-lXXX'.
 libdir=${exec_prefix}/lib
 # Directory to search by default for included makefiles.
@@ -49,7 +50,8 @@ objs="%objs% remote-${REMOTE}.o ${extras} ${ALLOCA}"
 # 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 $defines $CPPFLAGS $CFLAGS \
+      -c -I. -I${srcdir} -I${srcdir}/glob ${srcdir}/$file
 done
 
 # The object files were actually all put in the current directory.