diff options
| author | jbj <devnull@localhost> | 2003-03-20 23:42:05 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-03-20 23:42:05 +0000 |
| commit | 96cd0c2e288fa8ca561ad814265bc2138a80ddaa (patch) | |
| tree | 8c3939312d025ed2db8e0822023e340252546d30 /build | |
| parent | 97ec1053c9290e6f43e661be733ba08e3b1175b5 (diff) | |
| download | rpm-96cd0c2e288fa8ca561ad814265bc2138a80ddaa.tar.gz rpm-96cd0c2e288fa8ca561ad814265bc2138a80ddaa.tar.bz2 rpm-96cd0c2e288fa8ca561ad814265bc2138a80ddaa.zip | |
Make sure that $(RPM_BUILD_ROOT}/usr/lib is 1st libarry searched.
Bump popt version.
CVS patchset: 6710
CVS date: 2003/03/20 23:42:05
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Makefile.am b/build/Makefile.am index 51fe8551d..e098e30c7 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -19,7 +19,7 @@ pkgincdir = $(pkgincludedir) pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h noinst_HEADERS = buildio.h -LDFLAGS = -L$(DESTDIR)$(usrlibdir) +LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpmbuild.la @@ -28,7 +28,7 @@ librpmbuild_la_SOURCES = \ parseBuildInstallClean.c parseChangelog.c parseDescription.c \ parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \ parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c -librpmbuild_la_LDFLAGS = -release @VERSION@ \ +librpmbuild_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ |