diff options
| author | Tom Yu <tlyu@mit.edu> | 1995-07-02 10:50:04 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1995-07-02 10:50:04 +0000 |
| commit | 8ad59cabadf0ac64b4b8f0e6690e4689cd44094d (patch) | |
| tree | 2af702909474320865777d8e0f521e52d3da0377 /src | |
| parent | 3366c9fe9c2199954d2a6e99774bd1c7d2d069e9 (diff) | |
| download | krb5-8ad59cabadf0ac64b4b8f0e6690e4689cd44094d.tar.gz krb5-8ad59cabadf0ac64b4b8f0e6690e4689cd44094d.tar.xz krb5-8ad59cabadf0ac64b4b8f0e6690e4689cd44094d.zip | |
* aclocal.m4 (SubdirLibRule): don't recreate DONE if list of objs
is null to avoid re-making lotsa stuff.
(_MAKE_SUBDIRS): really gross sh hack for subdir
recursion; make -[ik] should dtrt now even with broken
makes (like Ultrix) that do sh -ce "rule". Basically,
throw an "if" test around the recursion line so that even
if the -e option to sh is set by make, an error in a
subdir below won't cause for loop to exit unless we want
it to.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6218 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 11 | ||||
| -rw-r--r-- | src/aclocal.m4 | 12 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8a948d937..5dd55e4ce 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +Sun Jul 2 04:40:50 1995 Tom Yu <tlyu@lothlorien.MIT.EDU> + + * aclocal.m4 (SubdirLibRule): don't recreate DONE if list of objs + is null to avoid re-making lotsa stuff. + (_MAKE_SUBDIRS): really gross sh hack for subdir + recursion; make -[ik] should dtrt now even with broken + makes (like Ultrix) that do sh -ce "rule". Basically, + throw an "if" test around the recursion line so that even + if the -e option to sh is set by make, an error in a + subdir below won't cause for loop to exit unless we want + it to. Fri Jun 30 14:26:01 EDT 1995 Paul Park (pjpark@mit.edu) * aclocal.m4(V5_SHARED_LIB_OBJS) - Change explicit $(srcdir)/$*.c to diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 6fee5f22a..24f16a08d 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -86,11 +86,12 @@ changequote(<<<,>>>)dnl $2::<<< @case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \ - *[ik]*) set +e;; *) set -e;; esac; \ + *[ik]*) e=:;; *) e=break;; esac; \ for i in $(SUBDIRS) ; do \ - (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \ + if (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \ $(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \ - CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$3<<<) \ + CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$3<<<) then :; \ + else $$e; fi; \ done>>> changequote([,])dnl AC_POP_MAKEFILE()dnl @@ -486,7 +487,10 @@ AC_PUSH_MAKEFILE()dnl all:: DONE DONE:: $1 - echo $1 > [$]@ + @if test x'$1' = x && test -r [$]@; then :;\ + else \ + (set -x; echo $1 > [$]@) \ + fi clean:: $(RM) DONE |