mostly changes to prevent spewage of ignored errors

Maybe clean this up more later

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 60640424a037f6da8ea07e1d2b8a25968f9b2305..d4ae3be30a0a82de1014fa9ee63b0f365037860d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul  3 07:46:25 1994  Tom Yu  (tlyu at dragons-lair)
+
+       * aclocal.m4: fixing things so we don't have to bother ignoring
+       errors.
+
 Fri Jul  1 13:01:19 1994  Mark Eichin  (eichin@cygnus.com)
 
        * aclocal.m4: added WITH_CC for use when CONFIG_RULES isn't safe.

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c4b3e86c401193990b85770189f0aa9eb16e3d38..a56c0a0648619f123dae1195400780c05320d687 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -357,9 +357,8 @@ define(CopyHeader,[
 divert(9)dnl
 
 includes:: $1
-       -mkdir $2
-       -if cmp $1 $2/$1 >/dev/null 2>&1; then \
-               echo ; \
+       if test -d $2; then :; else mkdir $2; fi
+       if cmp $1 $2/$1 >/dev/null 2>&1; then :; \
        else \
                [$](RM) $2/$1 ; \
                [$](CP) $1 $2/$1; \
@@ -374,9 +373,8 @@ define(CopySrcHeader,[
 divert(9)dnl
 
 includes:: $1
-       -mkdir $2
-       -if cmp $(srcdir)/$1 $2/$1 >/dev/null 2>&1; then \
-               echo ; \
+       if test -d $2; then :; else mkdir $2; fi
+       -if cmp $(srcdir)/$1 $2/$1 >/dev/null 2>&1; then :; \
        else \
                [$](RM) $2/$1 ; \
                [$](CP) $(srcdir)/$1 $2/$1; \
@@ -457,10 +455,13 @@ dnl
 undefine([AC_PROG_LEX])dnl
 define(AC_PROG_LEX,
 [AC_PROVIDE([$0])dnl
-LEX="lex"
+AC_PROGRAM_CHECK(LEX, flex, flex, lex)dnl
 if test -z "$LEXLIB"
 then
-   AC_HAVE_LIBRARY(l, LEXLIB="-ll")
+   case "$LEX" in
+   flex*) AC_HAVE_LIBRARY(fl, LEXLIB="-lfl") ;;
+   *) AC_HAVE_LIBRARY(l, LEXLIB="-ll") ;;
+   esac
 fi
 AC_VERBOSE(setting LEXLIB to $LEXLIB)
 AC_SUBST(LEX)AC_SUBST(LEXLIB)])dnl

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index c39aa6fc8bb3207c215f25397b248aad44e31882..5bd324cdca1b41de1a7ea109733a15334806252d 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,6 +1,10 @@
 Sun Jul  3 04:41:54 1994  Tom Yu  (tlyu at dragons-lair)
 
+       * post.in: whoops, now making sure errors don't get returned if
+       something is empty
+
        * post.in: fixing missing semicolon in make rules
+       * pre.in: MV=mv -f
 
 Sat Jul  2 00:03:24 1994  Tom Yu  (tlyu at dragons-lair)
 

diff --git a/src/config/post.in b/src/config/post.in
index 279aee7653cd9ee29b4849b6382aae37dec4e673..8d9495e371aaceea065a4c59ebb9fae60bd37c2d 100644 (file)
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -4,5 +4,5 @@
 all::
 
 clean::
-       if test -n "$(OBJS)" ; then $(RM) $(OBJS); fi
+       if test -n "$(OBJS)" ; then $(RM) $(OBJS); else :; fi
 

diff --git a/src/config/pre.in b/src/config/pre.in
index e2ff74566ee7be4c7d60a91a2550deaca2ffbc6e..7a6ad2b7363e22d5cd7d022715e488a0b2861a90 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -30,7 +30,7 @@ KRB5_INCSUBDIRS = \
 
 RM = rm -f
 CP  = cp
-MV = mv
+MV = mv -f
 CHMOD=chmod
 RANLIB = @RANLIB@
 ARCHIVE = @ARCHIVE@

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index ed2e3b5ffa05e8848af332a5cc513949c97a9f54..168931109d2b0331f6b1e0fea501c5bcda4a15a4 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jul  3 07:48:04 1994  Tom Yu  (tlyu at dragons-lair)
+
+       * Makefile.in: cleaning up to not spew ignored errors
+
 Wed Jun 22 18:47:36 1994  Mark Eichin  (eichin@tweedledumber.cygnus.com)
 
        * com_err.h: Only set STDARG_PROTOTYPES based on STDC if it isn't

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index da9563ce5e94b8a761b7155abbe065a89d6f3d30..f7cf3d04fa4a2dcaca250f9146ffb4c35b5436eb 100644 (file)
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -66,8 +66,7 @@ install:: compile_et.1
 all:: libcom_err.a
 
 libcom_err.a: $(LIBOBJS)
-       $(RM) $@.bak
-       -mv $@ $@.bak
+       if test -f $@; then $(RM) $@.bak; $(MV) $@ $@.bak; else :; fi;
        $(ARCHIVE) $@ $(LIBOBJS)
        $(RANLIB) $@
 

diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 6141d29a776b37255f00f4cccc7fa33fe4650676..07948944be3027647346aa2c8f9f858e6a082d1a 100644 (file)
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jul  3 07:48:43 1994  Tom Yu  (tlyu at dragons-lair)
+
+       * Makefile.in: changing things to now spew ignored errors.
+
 Wed Jun 22 18:51:50 1994  Mark Eichin  (eichin@cygnus.com)
 
        * configure.in: ss_err.h is *not* a SrcHeader. Note that there is

diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index 6f87588242c7ce9a37c719b5066542b74f60470c..f3b058558a32757e129fe04b7f1913f82ed78bed 100644 (file)
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -101,17 +101,16 @@ clean::
 depend:: ss_err.h
 
 ct.tab.c ct.tab.h: ct.y
-       rm -f ct.tab.* y.*
+       $(RM) ct.tab.* y.*
        yacc -d $(srcdir)/ct.y
-       mv -f y.tab.c ct.tab.c
-       mv -f y.tab.h ct.tab.h
+       $(MV) y.tab.c ct.tab.c
+       $(MV) y.tab.h ct.tab.h
 
 # install_library_target(ss,$(OBJS),$(SRCS),)
 all:: libss.a
 
 libss.a: $(OBJS)
-       $(RM) $@.bak
-       -$(MV) $@ $@.bak
+       if test -f $@; then $(RM) $@.bak; $(MV) $@ $@.bak; else :; fi
        $(ARCHIVE) $@ $(OBJS)
        $(RANLIB) $@