From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 17 Dec 2005 03:55:02 +0000 (+0000)
Subject: * Makefile.in (all-unix): Do depend on all-libs.
X-Git-Tag: ms-bug-test-20060525~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57da39d39e5afe9592de4cd7bb3de362e7443ca3;p=krb5.git

* Makefile.in (all-unix): Do depend on all-libs.
* test/Makefile.in (PROG_LIBPATH, DB_DEPLIB): Look for library in .. instead
of $TOPLIBD.

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

diff --git a/src/modules/kdb/db2/libdb2/ChangeLog b/src/modules/kdb/db2/libdb2/ChangeLog
index c7e92cfa2..38efcb1c8 100644
--- a/src/modules/kdb/db2/libdb2/ChangeLog
+++ b/src/modules/kdb/db2/libdb2/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-unix): Do depend on all-libs.
+
 2005-10-27  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Set build_dynobj=yes.
diff --git a/src/modules/kdb/db2/libdb2/Makefile.in b/src/modules/kdb/db2/libdb2/Makefile.in
index 693773e67..18c85ed03 100644
--- a/src/modules/kdb/db2/libdb2/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/Makefile.in
@@ -15,7 +15,7 @@ RELDIR=../modules/kdb/db2/libdb2
 HDRDIR=$(BUILDTOP)/include
 HDRS =	$(HDRDIR)/db.h $(HDRDIR)/db-config.h $(HDRDIR)/db-ndbm.h
 
-all-unix:: includes
+all-unix:: includes all-libs
 all-prerecurse: include/config.h include/db-config.h
 clean-unix:: clean-libs clean-includes
 
diff --git a/src/modules/kdb/db2/libdb2/test/ChangeLog b/src/modules/kdb/db2/libdb2/test/ChangeLog
index fbd5dcccb..ee1c78df6 100644
--- a/src/modules/kdb/db2/libdb2/test/ChangeLog
+++ b/src/modules/kdb/db2/libdb2/test/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (PROG_LIBPATH, DB_DEPLIB): Look for library in
+	.. instead of $TOPLIBD.
+
 2005-10-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (BUILDTOP, myfulldir): Updated for directory move.
diff --git a/src/modules/kdb/db2/libdb2/test/Makefile.in b/src/modules/kdb/db2/libdb2/test/Makefile.in
index 3b9253de7..2c1f851c8 100644
--- a/src/modules/kdb/db2/libdb2/test/Makefile.in
+++ b/src/modules/kdb/db2/libdb2/test/Makefile.in
@@ -9,13 +9,13 @@ TMPDIR=.
 LOCALINCLUDES=	-I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
 		-I$(srcdir)/../btree -I$(srcdir)/../hash -I$(srcdir)/../db
 
-PROG_LIBPATH=-L$(TOPLIBD)
+PROG_LIBPATH=-L..
 PROG_RPATH=$(KRB5_LIBDIR)
 
 KRB5_RUN_ENV= @KRB5_RUN_ENV@
 
 DB_LIB		= -ldb
-DB_DEPLIB	= $(TOPLIBD)/libdb$(DEPLIBEXT)
+DB_DEPLIB	= ../libdb$(DEPLIBEXT)
 
 all::