| @@ -1,42 +1,134 @@ | | | @@ -1,42 +1,134 @@ |
1 | $NetBSD: patch-aa,v 1.6 2008/02/21 19:32:23 jlam Exp $ | | 1 | $NetBSD: patch-aa,v 1.7 2009/09/09 16:58:52 joerg Exp $ |
2 | | | 2 | |
3 | --- ../dist/Makefile.in.orig 1998-12-07 14:05:59.000000000 -0500 | | 3 | --- ../dist/Makefile.in.orig 1998-12-07 20:05:59.000000000 +0100 |
4 | +++ ../dist/Makefile.in | | 4 | +++ ../dist/Makefile.in |
5 | @@ -3,7 +3,7 @@ | | 5 | @@ -3,9 +3,9 @@ |
6 | srcdir= @srcdir@/.. | | 6 | srcdir= @srcdir@/.. |
7 | CPPFLAGS=-I. -I$(srcdir)/include @CPPFLAGS@ | | 7 | CPPFLAGS=-I. -I$(srcdir)/include @CPPFLAGS@ |
8 | CFLAGS= -c @CFLAGS@ $(CPPFLAGS) | | 8 | CFLAGS= -c @CFLAGS@ $(CPPFLAGS) |
9 | -CC= @CC@ | | 9 | -CC= @CC@ |
10 | +CC= $(LIBTOOL) @CC@ | | 10 | +CC= $(LIBTOOL) --mode=compile @CC@ |
11 | CXXFLAGS=-c @CXXFLAGS@ $(CPPFLAGS) | | 11 | CXXFLAGS=-c @CXXFLAGS@ $(CPPFLAGS) |
12 | CXX= @CXX@ | | 12 | -CXX= @CXX@ |
| | | 13 | +CXX= $(LIBTOOL) --mode=compile @CXX@ |
13 | LDFLAGS=@LDFLAGS@ | | 14 | LDFLAGS=@LDFLAGS@ |
14 | @@ -43,13 +43,11 @@ PROGS= @build_additional@ db_archive db_ | | 15 | LIBS= @LIBS@ |
| | | 16 | |
| | | 17 | @@ -43,85 +43,83 @@ PROGS= @build_additional@ db_archive db_ |
15 | LOBJS= @LIBOBJS@ | | 18 | LOBJS= @LIBOBJS@ |
16 | POBJS= err.o getlong.o | | 19 | POBJS= err.o getlong.o |
17 | | | 20 | |
18 | -libdb= libdb.a | | 21 | -libdb= libdb.a |
19 | +libdb= libdb2.la | | 22 | +libdb= libdb2.la |
20 | all: $(libdb) $(PROGS) | | 23 | all: $(libdb) $(PROGS) |
21 | | | 24 | |
22 | $(libdb): db.h $(OBJS) $(LOBJS) | | 25 | $(libdb): db.h $(OBJS) $(LOBJS) |
23 | - $(rm) -f $@ | | 26 | - $(rm) -f $@ |
24 | - $(ar) $@ $(OBJS) $(LOBJS) | | 27 | - $(ar) $@ $(OBJS) $(LOBJS) |
25 | - test ! -f $(ranlib) || $(ranlib) $@ | | 28 | - test ! -f $(ranlib) || $(ranlib) $@ |
26 | + $(LIBTOOL) --mode=link @CC@ @CFLAGS@ -rpath $(prefix)/lib -version-info 2:7 -o $@ $(OBJS:.o=.lo) $(LOBJS:.o=.lo) | | 29 | + $(LIBTOOL) --mode=link @CC@ @CFLAGS@ -rpath $(prefix)/lib -version-info 2:7 -o $@ $(OBJS:.o=.lo) $(LOBJS:.o=.lo) |
27 | | | 30 | |
28 | DBA= db_archive.o $(POBJS) | | 31 | DBA= db_archive.o $(POBJS) |
29 | db_archive: $(DBA) $(libdb) | | 32 | db_archive: $(DBA) $(libdb) |
| | | 33 | - $(CC) -o $@ $(LDFLAGS) $(DBA) $(libdb) $(LIBS) |
| | | 34 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBA) $(libdb) $(LIBS) |
| | | 35 | |
| | | 36 | DBB= db_checkpoint.o $(POBJS) |
| | | 37 | db_checkpoint: $(DBB) $(libdb) |
| | | 38 | - $(CC) -o $@ $(LDFLAGS) $(DBB) $(libdb) $(LIBS) |
| | | 39 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBB) $(libdb) $(LIBS) |
| | | 40 | |
| | | 41 | DBC= db_deadlock.o $(POBJS) |
| | | 42 | db_deadlock: $(DBC) $(libdb) |
| | | 43 | - $(CC) -o $@ $(LDFLAGS) $(DBC) $(libdb) $(LIBS) |
| | | 44 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBC) $(libdb) $(LIBS) |
| | | 45 | |
| | | 46 | DBD= db_dump.o $(POBJS) |
| | | 47 | db_dump: $(DBD) $(libdb) |
| | | 48 | - $(CC) -o $@ $(LDFLAGS) $(DBD) $(libdb) $(LIBS) |
| | | 49 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBD) $(libdb) $(LIBS) |
| | | 50 | |
| | | 51 | DBE= db_dump185.o $(POBJS) |
| | | 52 | db_dump185: $(DBE) |
| | | 53 | - $(CC) -o $@ $(LDFLAGS) $(DBE) $(LIBS) |
| | | 54 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBE) $(LIBS) |
| | | 55 | |
| | | 56 | DBF= db_load.o $(POBJS) |
| | | 57 | db_load: $(DBF) $(libdb) |
| | | 58 | - $(CC) -o $@ $(LDFLAGS) $(DBF) $(libdb) $(LIBS) |
| | | 59 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBF) $(libdb) $(LIBS) |
| | | 60 | |
| | | 61 | DBG= db_printlog.o $(POBJS) |
| | | 62 | db_printlog: $(DBG) $(libdb) |
| | | 63 | - $(CC) -o $@ $(LDFLAGS) $(DBG) $(libdb) $(LIBS) |
| | | 64 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBG) $(libdb) $(LIBS) |
| | | 65 | |
| | | 66 | DBH= db_recover.o $(POBJS) |
| | | 67 | db_recover: $(DBH) $(libdb) |
| | | 68 | - $(CC) -o $@ $(LDFLAGS) $(DBH) $(libdb) $(LIBS) |
| | | 69 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBH) $(libdb) $(LIBS) |
| | | 70 | |
| | | 71 | DBI= db_stat.o $(POBJS) |
| | | 72 | db_stat: $(DBI) $(libdb) |
| | | 73 | - $(CC) -o $@ $(LDFLAGS) $(DBI) $(libdb) $(LIBS) |
| | | 74 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBI) $(libdb) $(LIBS) |
| | | 75 | |
| | | 76 | EPROGS= ex_access ex_appinit ex_btrec ex_lock ex_mpool ex_thread ex_tpcb |
| | | 77 | DBJ= ex_access.o |
| | | 78 | ex_access: $(DBJ) $(libdb) |
| | | 79 | - $(CC) -o $@ $(LDFLAGS) $(DBJ) $(libdb) $(LIBS) |
| | | 80 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBJ) $(libdb) $(LIBS) |
| | | 81 | |
| | | 82 | DBK= ex_appinit.o |
| | | 83 | ex_appinit: $(DBK) $(libdb) |
| | | 84 | - $(CC) -o $@ $(LDFLAGS) $(DBK) $(libdb) $(LIBS) |
| | | 85 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBK) $(libdb) $(LIBS) |
| | | 86 | |
| | | 87 | DBL= ex_btrec.o |
| | | 88 | ex_btrec: $(DBL) $(libdb) |
| | | 89 | - $(CC) -o $@ $(LDFLAGS) $(DBL) $(libdb) $(LIBS) |
| | | 90 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBL) $(libdb) $(LIBS) |
| | | 91 | |
| | | 92 | DBM= ex_lock.o $(POBJS) |
| | | 93 | ex_lock: $(DBM) $(libdb) |
| | | 94 | - $(CC) -o $@ $(LDFLAGS) $(DBM) $(libdb) $(LIBS) |
| | | 95 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBM) $(libdb) $(LIBS) |
| | | 96 | |
| | | 97 | DBN= ex_mpool.o |
| | | 98 | ex_mpool: $(DBN) $(libdb) |
| | | 99 | - $(CC) -o $@ $(LDFLAGS) $(DBN) $(libdb) $(LIBS) |
| | | 100 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBN) $(libdb) $(LIBS) |
| | | 101 | |
| | | 102 | DBO= ex_thread.o |
| | | 103 | ex_thread: $(DBO) $(libdb) |
| | | 104 | - $(CC) -o $@ $(LDFLAGS) $(DBO) $(libdb) $(LIBS) |
| | | 105 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBO) $(libdb) $(LIBS) |
| | | 106 | |
| | | 107 | DBP= ex_tpcb.o $(POBJS) |
| | | 108 | ex_tpcb: $(DBP) $(libdb) |
| | | 109 | - $(CC) -o $@ $(LDFLAGS) $(DBP) $(libdb) $(LIBS) |
| | | 110 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBP) $(libdb) $(LIBS) |
| | | 111 | |
| | | 112 | DBT= tclAppInit.o tcl_dbm.o tcl_hsearch.o tcl_lock.o tcl_log.o tcl_mpool.o \ |
| | | 113 | tcl_mutex.o tcl_ndbm.o tcl_txn.o utils.o $(POBJS) |
| | | 114 | |
| | | 115 | dbtest: .dbtestrc |
| | | 116 | dbtest: $(DBT) $(libdb) |
| | | 117 | - $(CC) -o $@ $(LDFLAGS) $(DBT) $(libdb) $(LIBS) |
| | | 118 | + $(LIBTOOL) --mode=link @CC@ -o $@ $(LDFLAGS) $(DBT) $(libdb) $(LIBS) |
| | | 119 | |
| | | 120 | AOBJS= err.o getcwd.o getlong.o getopt.o memcmp.o memcpy.o memmove.o \ |
| | | 121 | raise.o snprintf.o strerror.o strsep.o vsnprintf.o |
30 | @@ -141,11 +139,11 @@ realclean distclean: clean | | 122 | @@ -141,11 +139,11 @@ realclean distclean: clean |
31 | $(rm) -f confdefs.h db.h db_int.h db_185.h include.tcl | | 123 | $(rm) -f confdefs.h db.h db_int.h db_185.h include.tcl |
32 | | | 124 | |
33 | prefix= @prefix@ | | 125 | prefix= @prefix@ |
34 | -bindir= $(prefix)/BerkeleyDB/bin | | 126 | -bindir= $(prefix)/BerkeleyDB/bin |
35 | -datadir=$(prefix)/BerkeleyDB/share | | 127 | -datadir=$(prefix)/BerkeleyDB/share |
36 | -includedir=$(prefix)/BerkeleyDB/include | | 128 | -includedir=$(prefix)/BerkeleyDB/include |
37 | -libdir= $(prefix)/BerkeleyDB/lib | | 129 | -libdir= $(prefix)/BerkeleyDB/lib |
38 | -mandir= $(prefix)/BerkeleyDB/docs | | 130 | -mandir= $(prefix)/BerkeleyDB/docs |
39 | +bindir= $(prefix)/bin | | 131 | +bindir= $(prefix)/bin |
40 | +datadir=$(prefix)/share/db2 | | 132 | +datadir=$(prefix)/share/db2 |
41 | +includedir=$(prefix)/include/db2 | | 133 | +includedir=$(prefix)/include/db2 |
42 | +libdir= $(prefix)/lib | | 134 | +libdir= $(prefix)/lib |
| @@ -55,37 +147,37 @@ $NetBSD: patch-aa,v 1.6 2008/02/21 19:32 | | | @@ -55,37 +147,37 @@ $NetBSD: patch-aa,v 1.6 2008/02/21 19:32 |
55 | - @cd $(includedir) && $(chmod) $(fmode) db.h db_185.h db_cxx.h | | 147 | - @cd $(includedir) && $(chmod) $(fmode) db.h db_185.h db_cxx.h |
56 | + @test -d $(DESTDIR)$(includedir) || \ | | 148 | + @test -d $(DESTDIR)$(includedir) || \ |
57 | + ($(mkdir) -p $(DESTDIR)$(includedir) && $(chmod) $(dmode) $(DESTDIR)$(includedir)) | | 149 | + ($(mkdir) -p $(DESTDIR)$(includedir) && $(chmod) $(dmode) $(DESTDIR)$(includedir)) |
58 | + @$(BSD_INSTALL_DATA) db.h db_185.h $(srcdir)/include/db_cxx.h $(DESTDIR)$(includedir) | | 150 | + @$(BSD_INSTALL_DATA) db.h db_185.h $(srcdir)/include/db_cxx.h $(DESTDIR)$(includedir) |
59 | + @cd $(DESTDIR)$(includedir) && $(chmod) $(fmode) db.h db_185.h db_cxx.h | | 151 | + @cd $(DESTDIR)$(includedir) && $(chmod) $(fmode) db.h db_185.h db_cxx.h |
60 | @echo "Installing DB library: $(libdir) ..." | | 152 | @echo "Installing DB library: $(libdir) ..." |
61 | - @test -d $(libdir) || \ | | 153 | - @test -d $(libdir) || \ |
62 | - ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir)) | | 154 | - ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir)) |
63 | - @cd $(libdir) && $(rm) -f $(libdb) | | 155 | - @cd $(libdir) && $(rm) -f $(libdb) |
64 | - @$(cp) -p $(libdb) $(libdir) | | 156 | - @$(cp) -p $(libdb) $(libdir) |
65 | - @cd $(libdir) && $(chmod) $(fmode) $(libdb) | | 157 | - @cd $(libdir) && $(chmod) $(fmode) $(libdb) |
66 | + @test -d $(DESTDIR)$(libdir) || \ | | 158 | + @test -d $(DESTDIR)$(libdir) || \ |
67 | + ($(mkdir) -p $(DESTDIR)$(libdir) && $(chmod) $(dmode) $(DESTDIR)$(libdir)) | | 159 | + ($(mkdir) -p $(DESTDIR)$(libdir) && $(chmod) $(dmode) $(DESTDIR)$(libdir)) |
68 | + @$(LIBTOOL) $(BSD_INSTALL_DATA) $(libdb) $(DESTDIR)$(libdir) | | 160 | + @$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(libdb) $(DESTDIR)$(libdir) |
69 | @echo "Installing DB utilities: $(bindir) ..." | | 161 | @echo "Installing DB utilities: $(bindir) ..." |
70 | - @test -d $(bindir) || \ | | 162 | - @test -d $(bindir) || \ |
71 | - ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir)) | | 163 | - ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir)) |
72 | - @cd $(bindir) && $(rm) -f $(PROGS) | | 164 | - @cd $(bindir) && $(rm) -f $(PROGS) |
73 | - @$(cp) -p $(PROGS) $(bindir) | | 165 | - @$(cp) -p $(PROGS) $(bindir) |
74 | - @cd $(bindir) && (test ! -f $(strip) || $(strip) $(PROGS)) | | 166 | - @cd $(bindir) && (test ! -f $(strip) || $(strip) $(PROGS)) |
75 | - @cd $(bindir) && $(chmod) $(emode) $(PROGS) | | 167 | - @cd $(bindir) && $(chmod) $(emode) $(PROGS) |
76 | + @test -d $(DESTDIR)$(bindir) || \ | | 168 | + @test -d $(DESTDIR)$(bindir) || \ |
77 | + ($(mkdir) -p $(DESTDIR)$(bindir) && $(chmod) $(dmode) $(DESTDIR)$(bindir)) | | 169 | + ($(mkdir) -p $(DESTDIR)$(bindir) && $(chmod) $(dmode) $(DESTDIR)$(bindir)) |
78 | + @for prog in $(PROGS); do \ | | 170 | + @for prog in $(PROGS); do \ |
79 | + db2prog=`echo $$prog | sed $(transform)`; \ | | 171 | + db2prog=`echo $$prog | sed $(transform)`; \ |
80 | + $(LIBTOOL) $(BSD_INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/$$db2prog; \ | | 172 | + $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/$$db2prog; \ |
81 | + done | | 173 | + done |
82 | @echo "Installing documentation: $(mandir) ..." | | 174 | @echo "Installing documentation: $(mandir) ..." |
83 | - @test -d $(mandir) || \ | | 175 | - @test -d $(mandir) || \ |
84 | - ($(mkdir) -p $(mandir) && $(chmod) $(dmode) $(mandir)) | | 176 | - ($(mkdir) -p $(mandir) && $(chmod) $(dmode) $(mandir)) |
85 | - @cd $(srcdir)/docs && $(cp) -pr * $(mandir)/ | | 177 | - @cd $(srcdir)/docs && $(cp) -pr * $(mandir)/ |
86 | + @test -d $(DESTDIR)$(mandir) || \ | | 178 | + @test -d $(DESTDIR)$(mandir) || \ |
87 | + ($(mkdir) -p $(DESTDIR)$(mandir) && $(chmod) $(dmode) $(DESTDIR)$(mandir)) | | 179 | + ($(mkdir) -p $(DESTDIR)$(mandir) && $(chmod) $(dmode) $(DESTDIR)$(mandir)) |
88 | + @cd $(srcdir)/docs && $(cp) -pr * $(DESTDIR)$(mandir)/ | | 180 | + @cd $(srcdir)/docs && $(cp) -pr * $(DESTDIR)$(mandir)/ |
89 | | | 181 | |
90 | uninstall: | | 182 | uninstall: |
91 | -cd $(bindir) && $(rm) -f $(PROGS) | | 183 | -cd $(bindir) && $(rm) -f $(PROGS) |