summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog21
-rw-r--r--Makefile.am2
-rw-r--r--configure.in2
3 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f23418..cd135ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,22 @@
+1999-10-13 Paul D. Smith <psmith@gnu.org>
+
+ * configure.in (make_cv_sys_gnu_glob): We used to add the -Iglob
+ flag to CPPFLAGS, but that loses if the user specifies his own
+ CPPFLAGS; this one gets added _after_ his and if he happens to
+ have an old or broken glob.h--boom. Instead, put it in GLOBINC
+ and SUBST it.
+
+ * Makefile.am (INCLUDES): Add @GLOBINC@ to the INCLUDES macro;
+ these things get on the compile line well before the user's
+ CPPFLAGS.
+
1999-10-12 Paul D. Smith <psmith@gnu.org>
* remake.c (notice_finished_file): If we get here and -n is set,
- look for any commands that aren't recursive. If we find at least
- one, we assume that command updates the target and set mtime of
- the target to "very new". If there are none, then we ran every
- command there is, so check the mtime on this file just like we
- would normally, rather than assuming it's "very new".
+ see if all the command lines are marked recursive. If so, then we
+ ran every command there is, so check the mtime on this file just
+ like we would normally. If not, we assume the command we didn't
+ run would updates the target and set mtime of the target to "very new".
* job.c (start_job_command): Update lines_flags in the file's cmds
structure with any per-line tokens we found (`@', `-', `+').
diff --git a/Makefile.am b/Makefile.am
index e45abec..483d012 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ make_LDADD = @LIBOBJS@ @ALLOCA@ @GLOBLIB@
info_TEXINFOS = make.texinfo
man_MANS = make.1
-INCLUDES = -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\"
+INCLUDES = @GLOBINC@ -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\"
EXTRA_DIST = README build.sh.in $(man_MANS) README.customs remote-cstms.c\
make-stds.texi texinfo.tex SCOPTIONS SMakefile\
diff --git a/configure.in b/configure.in
index 6cb935f..ccfd3a0 100644
--- a/configure.in
+++ b/configure.in
@@ -206,7 +206,7 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [
case "$make_cv_sys_gnu_glob" in
yes) AC_MSG_RESULT(yes) ;;
no) AC_MSG_RESULT([no; using local copy])
- CPPFLAGS="$CPPFLAGS -I$srcdir/glob"
+ AC_SUBST(GLOBINC) GLOBINC='-I$(srcdir)/glob'
AC_SUBST(GLOBLIB) GLOBLIB=glob/libglob.a
;;
esac