From: Tom Yu <tlyu@mit.edu>
Date: Mon, 3 Jul 1995 19:17:41 +0000 (+0000)
Subject: 	* Makefile.in (libdb.a): Quiet the if statement
X-Git-Tag: krb5-1.0-beta6~1592
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bc939c1cd7f9c4f8bd0c04d91efb79f18bf38f85;p=krb5.git

	* Makefile.in (libdb.a): Quiet the if statement

	* configure.in: Symlink $(TOPLIBD)/libdb.* from the right place.

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

diff --git a/src/util/berk_db/ChangeLog b/src/util/berk_db/ChangeLog
index eb742538a..fefd245ab 100644
--- a/src/util/berk_db/ChangeLog
+++ b/src/util/berk_db/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul  3 12:11:51 1995  Tom Yu  <tlyu@lothlorien.MIT.EDU>
+
+	* Makefile.in (libdb.a): Quiet the if statement.
+
+	* configure.in: Symlink $(TOPLIBD)/libdb.* from the right place.
 
 Fri Jun 30 14:47:53 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* configure.in - Add --enable-shared check for building libdb shared.
diff --git a/src/util/berk_db/Makefile.in b/src/util/berk_db/Makefile.in
index a01f73fff..75d9cfa9a 100644
--- a/src/util/berk_db/Makefile.in
+++ b/src/util/berk_db/Makefile.in
@@ -22,15 +22,15 @@ libdb_ranlib: libdb.a
 	touch $@
 
 libdb.a: hash/DONE
-	if test -f $@ ; then \
+	@if test -f $@ ; then \
 		for i in $(LIB_SUBDIRS) ; \
 		do \
-			$(LIBUPDATE) $@ $$i/DONE $$i ; \
+			(set -x; $(LIBUPDATE) $@ $$i/DONE $$i) \
 		done ; \
 	else \
 		for i in $(LIB_SUBDIRS) ; \
 		do \
-			$(LIBUPDATE) --force $@ $$i/DONE $$i ; \
+			(set -x; $(LIBUPDATE) --force $@ $$i/DONE $$i) \
 		done ; \
 	fi
 	touch libdb.stamp
diff --git a/src/util/berk_db/configure.in b/src/util/berk_db/configure.in
index 21c702b33..1144724b4 100644
--- a/src/util/berk_db/configure.in
+++ b/src/util/berk_db/configure.in
@@ -11,7 +11,7 @@ V5_SHARED_LIB_OBJS
 V5_MAKE_SHARED_LIB(libdb)
 AC_ARG_ENABLE([shared],
 [  --enable-shared         build shared libraries],[
-LinkFileDir([$](TOPLIBD)/libdb.[$](SHEXT), libdb.[$](SHEXT), ../util/berk_db/hash)
+LinkFileDir([$](TOPLIBD)/libdb.[$](SHEXT), libdb.[$](SHEXT), ../util/berk_db)
 AppendRule([all -unix:: [$](TOPLIBD)/libdb.$(SHEXT)])
 AppendRule([install::	libdb.[$](SHEXT)
 	[$](INSTALL_DATA) libdb.[$](SHEXT)	\
@@ -20,7 +20,7 @@ AppendRule([install::	libdb.[$](SHEXT)
 if test -n "$krb5_cv_staticlibs_enabled" ; then
         AppendRule([install:: libdb.[$](STEXT)
 	[$](INSTALL_DATA) libdb.[$](STEXT) [$](DESTDIR)[$](KRB5_LIBDIR)[$](S)libdb.[$](STEXT)])
-        LinkFileDir([$](TOPLIBD)/libdb.[$](STEXT),libdb.[$](STEXT),../util/berk_db/hash)
+        LinkFileDir([$](TOPLIBD)/libdb.[$](STEXT),libdb.[$](STEXT),../util/berk_db)
         AppendRule([all:: [$](TOPLIBD)/libdb.[$](STEXT)])
 fi
 V5_AC_OUTPUT_MAKEFILE