* 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 c7e92cfa2dec299994d69c67a5d350c2c6009e34..38efcb1c8220929a5c665b8ed517eb1a94118242 100644 (file)
--- 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 693773e67ae47219ec31269133817e48ba0c9f78..18c85ed03bed9c66f878b7e115bca083ba0c0226 100644 (file)
--- 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 fbd5dcccb8cbd67095beb95ea3c347fe09e0eb57..ee1c78df6dd65cf140c642bd43932da7982d6ae3 100644 (file)
--- 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 3b9253de76dd05a9a3e0a2c072b1e79033267cc5..2c1f851c8f82aa6283a222d78ddd127d210557eb 100644 (file)
--- 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::