]>
Commit | Line | Data |
---|---|---|
43487f80 JB |
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 | |
3 | @@ -16,7 +16,7 @@ | |
012a8819 AM |
4 | po/*.in po/*.po po/rpm.pot \ |
5 | rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c | |
6 | ||
43487f80 JB |
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@ lua 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_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts tests doc . | |
012a8819 AM |
9 | |
10 | INCLUDES = \ | |
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 | |
aa0d0676 | 15 | @@ -25,17 +25,13 @@ |
74c62e75 AF |
16 | noinst_HEADERS = fprint.h header_internal.h legacy.h |
17 | ||
18 | pkgbindir = @RPMCONFIGDIR@ | |
012a8819 | 19 | -pkgbin_PROGRAMS = \ |
aa0d0676 AM |
20 | - rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump rpmdb_load \ |
21 | - rpmdb_printlog rpmdb_recover rpmdb_svc rpmdb_stat rpmdb_upgrade \ | |
22 | - rpmdb_verify | |
74c62e75 AF |
23 | |
24 | mylibs = librpmdb.la | |
25 | ||
012a8819 AM |
26 | LIBS = |
27 | ||
28 | # XXX watchout, ../db3/libdb.la created by this Makefile may surprise | |
29 | -libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la | |
30 | +libdb_la = | |
31 | ||
32 | # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different | |
33 | LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) | |
34 | @@ -52,7 +49,7 @@ | |
35 | $(top_builddir)/rpmio/librpmio.la \ | |
36 | @WITH_POPT_LIB@ \ | |
37 | @WITH_LIBELF_LIB@ | |
38 | -librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) | |
39 | +librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) -ldb | |
40 | librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la) | |
41 | ||
42 | # XXX make sure that db.h symlink is generated |