1 --- rpm-4.4.3/Makefile.am.orig 2005-11-18 22:49:12.762823560 +0100
2 +++ rpm-4.4.3/Makefile.am 2005-11-18 22:53:59.748195152 +0100
4 po/*.in po/*.po po/rpm.pot \
5 rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
7 -SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ @WITH_SYCK_SUBDIR@ @WITH_LUA_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts tests doc .
8 +SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_SYCK_SUBDIR@ @WITH_LUA_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts tests doc .
11 -I$(top_srcdir)/build \
12 diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am
13 --- rpm-4.3.org/rpmdb/Makefile.am 2003-12-28 01:33:46.160517288 +0100
14 +++ rpm-4.3/rpmdb/Makefile.am 2003-12-28 01:56:22.000000000 +0100
16 noinst_HEADERS = fprint.h header_internal.h legacy.h
18 pkgbindir = @RPMCONFIGDIR@
20 - rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump rpmdb_load \
21 - rpmdb_printlog rpmdb_recover rpmdb_svc rpmdb_stat rpmdb_upgrade \
28 # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
29 -libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
32 # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
33 LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
35 $(top_builddir)/rpmio/librpmio.la \
38 -librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
39 +librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) -ldb
40 librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
42 # XXX make sure that db.h symlink is generated