diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-09 04:52:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-09 04:52:10 +0000 |
| commit | cd7f9542e7d22636edc1ee17bee4caf438720034 (patch) | |
| tree | 63a2990637e62ab0253e0f1e47c3a093fe2e4d72 /pkgtools | |
| parent | 09ed13648317e87cc20363d55ff2e71cc039ad92 (diff) | |
| download | pkgsrc-cd7f9542e7d22636edc1ee17bee4caf438720034.tar.gz | |
Include bsd.prefs.mk after defining PKG_INFO so that we don't pass any
options to pkg_info while evaluating bsd.prefs.mk.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 941ea900cf8..2d2ad7de5fb 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2004/01/15 01:40:13 grant Exp $ +# $NetBSD: Makefile,v 1.92 2004/02/09 04:52:10 jlam Exp $ # Notes to package maintainers: # @@ -39,8 +39,6 @@ PLIST_SUBST+= PKG_TOOLS_BIN=${PKG_TOOLS_BIN} LIBNBCOMPAT_FILESDIR= ${.CURDIR}/../../pkgtools/libnbcompat/files LIBNBCOMPAT_SRCDIR= ${WRKDIR}/libnbcompat -.include "../../mk/bsd.prefs.mk" - CFLAGS+= -I${LIBNBCOMPAT_SRCDIR} LDFLAGS+= -L${LIBNBCOMPAT_SRCDIR} LIBS+= -lnbcompat @@ -48,12 +46,14 @@ LIBS+= -lnbcompat CPPFLAGS+= -DOPSYS_NAME='\"${OPSYS}\"' CPPFLAGS+= -DMACHINE_ARCH='\"${MACHINE_ARCH}\"' -VERSION!= ${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \ - ${FILESDIR}/lib/version.h - PKG_DBDIR?= /var/db/pkg PKG_INFO= PKG_DBDIR=${PKG_DBDIR} ${PKG_INFO_CMD} +.include "../../mk/bsd.prefs.mk" + +VERSION!= ${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \ + ${FILESDIR}/lib/version.h + do-extract: @${CP} -Rp ${LIBNBCOMPAT_FILESDIR} ${LIBNBCOMPAT_SRCDIR} @${CP} -Rp ${FILESDIR} ${WRKSRC} |