diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-08-23 02:27:23 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-08-23 02:27:23 +0000 |
| commit | d2ed5758cd65ff3ba8345f10d9b5ce3d4156a4dc (patch) | |
| tree | d0be1edf0c7633ae85d0eca95541bcae41fd6f02 | |
| parent | c6bda4d30411c809d67e9fcc0b6d6d7e392f2d8d (diff) | |
| download | krb5-d2ed5758cd65ff3ba8345f10d9b5ce3d4156a4dc.tar.gz krb5-d2ed5758cd65ff3ba8345f10d9b5ce3d4156a4dc.tar.xz krb5-d2ed5758cd65ff3ba8345f10d9b5ce3d4156a4dc.zip | |
aclocal.m4 (_MAKE_SUBDIRS): Change subdir recursion so that
a missing subdirectory is skipped.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6571 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/aclocal.m4 | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2a82b2330..011f5683d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 22 18:19:39 1995 <tytso@rsts-11.mit.edu> + + * aclocal.m4 (_MAKE_SUBDIRS): Change subdir recursion so that + a missing subdirectory is skipped. Mon Aug 21 16:42:42 EDT 1995 Paul Park (pjpark@mit.edu) * Makefile.in - Change mkdir to mkdir -p. diff --git a/src/aclocal.m4 b/src/aclocal.m4 index c2d322355..2fa2f7108 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -88,10 +88,14 @@ $2::<<< @case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \ *[ik]*) e=:;; *) e="exit 1";; esac; \ for i in $(SUBDIRS) ; do \ - if (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \ - $(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \ - CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$3<<<) then :; \ - else $$e; fi; \ + if test -d $$i ; then \ + echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \ + if (cd $$i ; $(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \ + CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$3<<<) then :; \ + else $$e; fi; \ + else \ + echo "Skipping missing directory $(CURRENT_DIR)$$i" ; \ + fi \ done>>> changequote([,])dnl AC_POP_MAKEFILE()dnl |