diff options
| author | sketch <sketch> | 2009-09-22 13:16:00 +0000 |
|---|---|---|
| committer | sketch <sketch> | 2009-09-22 13:16:00 +0000 |
| commit | 2e678144511b48b4b16d772b2f16c6783e3fce64 (patch) | |
| tree | b3aae584da5d07faaa6f65fd57c51fe5acb7c844 /misc | |
| parent | e540024b4fe525c7d9023f88e5f30e85cdaa5b18 (diff) | |
| download | pkgsrc-2e678144511b48b4b16d772b2f16c6783e3fce64.tar.gz | |
Revert previous, it breaks NetBSD. Will have to stay broken on Solaris for
a little longer.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/rpm/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 98b69cb4c14..263d5e72289 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2009/09/22 08:37:15 sketch Exp $ +# $NetBSD: Makefile,v 1.68 2009/09/22 13:16:00 sketch Exp $ DISTNAME= rpm-2.5.4 PKGREVISION= 6 @@ -33,13 +33,6 @@ MAKE_FLAGS+= ROOT=${DESTDIR} RPMDIR= ${RPM_DB_PREFIX}/lib/rpm FILES_SUBST+= RPMDIR=${RPMDIR:Q} -.include "../../mk/bdb.buildlink3.mk" - -# Ugly hack, but easier than fixing our bdb handling / rpm configure for now -.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS]) -LDFLAGS+= -ldb -.endif - .include "../../mk/bsd.prefs.mk" post-configure: @@ -62,4 +55,5 @@ BROKEN_GETTEXT_DETECTION= yes .include "../../devel/popt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |