From 1cabf291b0ff7246e81d2ff8d2eca3501b925803 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 13 Jun 1995 05:47:12 +0000 Subject: [PATCH] * 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 --- src/ChangeLog | 7 +++++++ src/aclocal.m4 | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index fdac9c0c6..13de4cc20 100644 --- 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 * acconfig.h: Removed HAS_ANSI_CONST, HAS_ANSI_VOLATILE, diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 0aa0c6eb9..4593e59a2 100644 --- 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) \ -- 2.26.2