From 3f6d9744f994f265a5d42fee50d0ca501fc654bd Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Sun, 3 Jul 1994 11:54:22 +0000
Subject: [PATCH] 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
---
 src/ChangeLog           |  5 +++++
 src/aclocal.m4          | 17 +++++++++--------
 src/config/ChangeLog    |  4 ++++
 src/config/post.in      |  2 +-
 src/config/pre.in       |  2 +-
 src/util/et/ChangeLog   |  4 ++++
 src/util/et/Makefile.in |  3 +--
 src/util/ss/ChangeLog   |  4 ++++
 src/util/ss/Makefile.in |  9 ++++-----
 9 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 60640424a..d4ae3be30 100644
--- 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 c4b3e86c4..a56c0a064 100644
--- 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 c39aa6fc8..5bd324cdc 100644
--- 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 279aee765..8d9495e37 100644
--- 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 e2ff74566..7a6ad2b73 100644
--- 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 ed2e3b5ff..168931109 100644
--- 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 da9563ce5..f7cf3d04f 100644
--- 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 6141d29a7..07948944b 100644
--- 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 6f8758824..f3b058558 100644
--- 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) $@
 
-- 
2.26.2