]>
Commit | Line | Data |
---|---|---|
14bbe769 JB |
1 | --- rpm-4.4.2/rpmio/Makefile.am.orig 2005-10-07 13:52:53.000000000 +0200 |
2 | +++ rpm-4.4.2/rpmio/Makefile.am 2005-11-08 15:56:58.000000000 +0100 | |
3 | @@ -26,8 +26,6 @@ | |
4 | ||
5 | BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs) | |
6 | ||
7 | -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) | |
8 | - | |
9 | usrlibdir = $(libdir)@MARK64@ | |
10 | usrlib_LTLIBRARIES = librpmio.la | |
11 | librpmio_la_SOURCES = \ | |
12 | --- rpm-4.4.2/rpmdb/Makefile.am.orig 2005-10-07 13:52:53.000000000 +0200 | |
13 | +++ rpm-4.4.2/rpmdb/Makefile.am 2005-11-08 15:56:49.000000000 +0100 | |
14 | @@ -37,9 +37,6 @@ | |
15 | # XXX watchout, ../db3/libdb.la created by this Makefile may surprise | |
16 | libdb_la = | |
17 | ||
18 | -# XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different | |
19 | -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) | |
20 | - | |
21 | usrlibdir = $(libdir)@MARK64@ | |
22 | usrlib_LTLIBRARIES = librpmdb.la | |
23 | librpmdb_la_SOURCES = \ | |
24 | --- rpm-4.4.2/lib/Makefile.am.orig 2005-10-07 13:52:53.000000000 +0200 | |
25 | +++ rpm-4.4.2/lib/Makefile.am 2005-11-08 15:56:22.000000000 +0100 | |
26 | @@ -29,8 +29,6 @@ | |
27 | mylibs = librpm.la | |
28 | LIBS = | |
29 | ||
30 | -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) | |
31 | - | |
32 | usrlibdir = $(libdir)@MARK64@ | |
33 | usrlib_LTLIBRARIES = librpm.la | |
34 | librpm_la_SOURCES = \ | |
35 | --- rpm-4.4.2/build/Makefile.am.orig 2005-03-14 11:03:48.000000000 +0100 | |
36 | +++ rpm-4.4.2/build/Makefile.am 2005-11-08 15:56:12.000000000 +0100 | |
37 | @@ -22,8 +22,6 @@ | |
38 | pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h | |
39 | noinst_HEADERS = buildio.h | |
40 | ||
41 | -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) | |
42 | - | |
43 | usrlibdir = $(libdir)@MARK64@ | |
44 | usrlib_LTLIBRARIES = librpmbuild.la | |
45 | librpmbuild_la_SOURCES = \ |