* 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

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 1f442097dcc43ce052767e0e4cc30a513d57d334..6bc8232a5932aeedb08676e845350e8ede4d297e 100644 (file)
--- 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 e6356db2464f29a564f69ea0d2106e58c8acbe03..8c4ffc2cea157ce198ba024c93a1b74d00c71698 100644 (file)
--- 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