[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Include bsd.prefs.mk after defini...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8ee2b6c61a9
branches:  trunk
changeset: 467972:a8ee2b6c61a9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 09 04:52:10 2004 +0000

description:
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:

 pkgtools/pkg_install/Makefile |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 0226d7ca25b5 -r a8ee2b6c61a9 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Mon Feb 09 04:35:12 2004 +0000
+++ b/pkgtools/pkg_install/Makefile     Mon Feb 09 04:52:10 2004 +0000
@@ -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 @@
 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 @@
 CPPFLAGS+=             -DOPSYS_NAME='\"${OPSYS}\"'
 CPPFLAGS+=             -DMACHINE_ARCH='\"${MACHINE_ARCH}\"'
 
+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
 
-PKG_DBDIR?=            /var/db/pkg
-PKG_INFO=              PKG_DBDIR=${PKG_DBDIR} ${PKG_INFO_CMD}
-
 do-extract:
        @${CP} -Rp ${LIBNBCOMPAT_FILESDIR} ${LIBNBCOMPAT_SRCDIR}
        @${CP} -Rp ${FILESDIR} ${WRKSRC}