1 diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am
2 --- rpm-4.3.org/Makefile.am 2003-12-28 01:33:43.917858224 +0100
3 +++ rpm-4.3/Makefile.am 2003-12-28 02:01:02.060822640 +0100
5 po/*.in po/*.po po/rpm.pot \
6 rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
8 -SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
9 +SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
12 -I$(top_srcdir)/build \
13 diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am
14 --- rpm-4.3.org/rpmdb/Makefile.am 2003-12-28 01:33:46.160517288 +0100
15 +++ rpm-4.3/rpmdb/Makefile.am 2003-12-28 01:56:22.000000000 +0100
17 noinst_HEADERS = fprint.h header_internal.h legacy.h
19 pkgbindir = @RPMCONFIGDIR@
21 - rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump rpmdb_load \
22 - rpmdb_printlog rpmdb_recover rpmdb_svc rpmdb_stat rpmdb_upgrade \
29 # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
30 -libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
33 # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
34 LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
36 $(top_builddir)/rpmio/librpmio.la \
39 -librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
40 +librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) -ldb
41 librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
43 # XXX make sure that db.h symlink is generated