summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/aclocal.m410
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8e4eb40e8..5dac8e7fd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 16 03:05:30 1995 Tom Yu (tlyu@dragons-lair)
+
+ * aclocal.m4 (_MAKE_SUBDIRS): fix rule so that MAKEFLAGS gets
+ processed correctly.
+
Fri May 5 01:50:08 1995 Theodore Y. Ts'o (tytso@dcl)
* patchlevel.h: Update patchlevel for BETA 5 release
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 62b4b819c..bfc1d4858 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -97,12 +97,12 @@ AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl
changequote(<<<,>>>)dnl
$2::<<<
- @case '${MFLAGS}' in *[ik]*) set +e ;; esac; \
- for i in $(SUBDIRS) ;\
- do \
+ @case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \
+ *[ik]*) set +e ;; *) set -e ;; esac; \
+ for i in $(SUBDIRS) ; do \
(cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
- $(MAKE) $(MFLAGS) CC="$(CC)" CCOPTS="$(CCOPTS)" \
- CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$3<<<) || exit 1; \
+ $(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \
+ CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$3<<<) \
done>>>
changequote([,])dnl
AC_DIVERT_POP()dnl