* aclocal.m4 (CopySrcHeader): do a set -x before mkdir

		_MAKE_SUBDIRS: inserted a "-@" rather than a "@" at the
		beginning of the rule; Ultrix make does /bin/sh -e
		ruleline if it's not there, and set +e doesn't work.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6050 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index fdac9c0c6dafdce9f4d80e07b3aeaebf0c95ebd2..13de4cc205884d93001b49a83998ea42cb8ddf68 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 13 01:44:12 1995  Tom Yu  (tlyu@dragons-lair)
+
+       * aclocal.m4 (CopySrcHeader): do a set -x before mkdir
+               _MAKE_SUBDIRS: inserted a "-@" rather than a "@" at the
+               beginning of the rule; Ultrix make does /bin/sh -e
+               ruleline if it's not there, and set +e doesn't work.
+
 Sat Jun 10 08:14:22 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * acconfig.h: Removed HAS_ANSI_CONST, HAS_ANSI_VOLATILE,

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 0aa0c6eb95e25e1ca43de67abcbf14e9d329dad6..4593e59a290d34bd4a46c8e2ac670bc8f463b15c 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -96,8 +96,8 @@ AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl
 changequote(<<<,>>>)dnl
 
 $2::<<<
-       @case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \
-               *[ik]*) set +e ;; *) set -e ;; esac; \
+       -@case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \
+               *[ik]*) ;; *) set -e ;; esac; \
        for i in $(SUBDIRS) ; do \
                (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
                        $(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \
@@ -459,7 +459,7 @@ define(CopySrcHeader,[
 AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl
 
 includes:: $1
-       @if test -d $2; then :; else mkdir $2; fi
+       @if test -d $2; then :; else (set -x; mkdir $2) fi
        @if cmp $(srcdir)/$1 $2/$1 >/dev/null 2>&1; then :; \
        else \
                (set -x; [$](RM) $2/$1; [$](CP) $(srcdir)/$1 $2/$1) \