From b77465ea9f30b65e547e95a731fda5b5e59cc7d5 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 30 Apr 1996 23:17:33 +0000
Subject: [PATCH] * Makefile.in (libkrb5.$(STEXT)): Set a variable with or
 without "--force" and use it, instead of duplicating the rest of the code. 
 Use LIBDONE as list to process, so berk_db will be skipped when not in use. 
 Check exit status of LIBUPDATE invocation.  Remove library before creating as
 workaround for libupdate bug.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7876 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/krb5/ChangeLog   |  8 ++++++++
 src/lib/krb5/Makefile.in | 21 +++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 1f442097d..6bc8232a5 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr 30 16:31:50 1996  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (libkrb5.$(STEXT)): Set a variable with or without
+	"--force" and use it, instead of duplicating the rest of the
+	code.  Use LIBDONE as list to process, so berk_db will be skipped
+	when not in use.  Check exit status of LIBUPDATE invocation.
+	Remove library before creating as workaround for libupdate bug.
+
 Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* Makefile.in: Folded in danw's changes to allow
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index e6356db24..8c4ffc2ce 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -32,23 +32,16 @@ all-unix::
 all-windows::
 
 libkrb5.$(STEXT): $(LIBDONE)
-	if test -f $@ ; then \
-		for i in $(LIB_SUBDIRS) ; \
-		do \
-			$(LIBUPDATE) $@ $$i/DONE $$i ; \
-		done ; \
-	else \
-		for i in $(LIB_SUBDIRS) ; \
-		do \
-			$(LIBUPDATE) --force $@ $$i/DONE $$i ; \
-		done ; \
-	fi
+	-rm -f $@ libkrb5.stamp
+	if test -f $@ ; then frc=--force ; else frc= ; fi ; \
+	for i in $(LIBDONE) ; \
+	do \
+		$(LIBUPDATE) $$frc $@ $$i `echo $$i | sed s,/DONE,,` \
+			|| exit 1 ; \
+	done
 	$(RANLIB) libkrb5.$(STEXT)
 	touch libkrb5.stamp
 
-
-
-
 clean-unix::
 	$(RM) libkrb5.$(LIBEXT) libkrb5.stamp
 
-- 
2.26.2