$NetBSD: patch-aa,v 1.1.1.1 1999/12/16 02:36:06 hubertf Exp $

--- ../dist/Makefile.in.orig	Thu Nov 11 08:09:48 1999
+++ ../dist/Makefile.in	Fri Dec  3 18:11:09 1999
@@ -18,7 +18,7 @@
 
 LDFLAGS=	@LDFLAGS@
 LIBS=		@LIBS@
-LIBDB_ARGS=	@LIBDB_ARGS@
+LIBDB_ARGS=	-L. -Wl,-R/usr/pkg/lib libdb3.a
 LIBTOOL=	@LIBTOOL@
 
 POSTLINK=	@POSTLINK@
@@ -27,9 +27,9 @@
 SOMAJOR=	@DB_VERSION_MAJOR@
 SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
 
-libdb=		libdb.a
+libdb=		libdb3.a
 
-libso_base=	libdb
+libso_base=	libdb3
 libso_linkname=	-ldb-$(SOVERSION)
 libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
 libso_target=	$(libso_base)-$(SOVERSION).la
@@ -43,8 +43,8 @@
 # You must configure it using:
 #	configure --enable-cxx [ --enable-dynamic ]
 ##################################################
-libcxx=		libdb_cxx.a
-libxso_base=	libdb_cxx
+libcxx=		libdb3_cxx.a
+libxso_base=	libdb3_cxx
 libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
 libxso_target=	$(libxso_base)-$(SOVERSION).la
 libxso_default=	$(libxso_base).@SOSUFFIX@
@@ -66,7 +66,7 @@
 JAVA_DBDIR=	$(JAVA_SRCDIR)/com/sleepycat/db
 JAVA_EXDIR=	$(JAVA_SRCDIR)/com/sleepycat/examples
 
-libjso_base=	libdb_java
+libjso_base=	libdb3_java
 libjso=		$(libjso_base)-$(SOVERSION).@SOSUFFIX@
 libjso_target=	$(libjso_base)-$(SOVERSION).la
 libjso_default=	$(libjso_base).@SOSUFFIX@
@@ -79,7 +79,7 @@
 # You must configure it using:
 #	configure --enable-tcl --enable-dynamic
 ##################################################
-libtso_base=	libdb_tcl
+libtso_base=	libdb3_tcl
 libtso=		$(libtso_base)-$(SOVERSION).@SOSUFFIX@
 libtso_target=	$(libtso_base)-$(SOVERSION).la
 libtso_default=	$(libtso_base).@SOSUFFIX@
@@ -91,9 +91,9 @@
 prefix=	@prefix@
 exec_prefix=@exec_prefix@
 bindir=	@bindir@
-includedir=@includedir@
+includedir=$(prefix)/include/db3
 libdir=	@libdir@
-docdir=	$(prefix)/docs
+docdir=	$(prefix)/share/doc/db3
 
 dmode=	755
 emode=	555
@@ -159,8 +159,8 @@
 UOBJS=	db_archive@o@ db_checkpoint@o@ db_deadlock@o@ db_dump185@o@ \
 	db_dump@o@ db_load@o@ db_printlog@o@ db_recover@o@ db_stat@o@
 
-PROGS=  @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock db_dump \
-	db_load db_printlog db_recover db_stat
+PROGS=  @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock db3_dump \
+	db3_load db3_printlog db3_recover db3_stat
 
 EPROGS=	ex_access ex_btrec ex_env ex_lock ex_mpool ex_thread ex_tpcb
 
@@ -235,39 +235,39 @@
 ##################################################
 # Utilities
 ##################################################
-db_archive: db_archive@o@ @DEFAULT_LIB@
+db3_archive: db_archive@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_archive@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_checkpoint: db_checkpoint@o@ @DEFAULT_LIB@
+db3_checkpoint: db_checkpoint@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_checkpoint@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_deadlock: db_deadlock@o@ @DEFAULT_LIB@
+db3_deadlock: db_deadlock@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_deadlock@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_dump: db_dump@o@ @DEFAULT_LIB@
+db3_dump: db_dump@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_dump185: db_dump185@o@ @LIBOBJS@
+db3_dump185: db_dump185@o@ @LIBOBJS@
 	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(LIBS)
 	$(POSTLINK) $@
 
-db_load: db_load@o@ @DEFAULT_LIB@
+db3_load: db_load@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_printlog: db_printlog@o@ @DEFAULT_LIB@
+db3_printlog: db_printlog@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_printlog@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_recover: db_recover@o@ @DEFAULT_LIB@
+db3_recover: db_recover@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_recover@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_stat: db_stat@o@ @DEFAULT_LIB@
+db3_stat: db_stat@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@