summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2003-08-31 11:55:09 +0000
committerjlam <jlam>2003-08-31 11:55:09 +0000
commit5c76d2c791a9c94306093f81ab00c56f43b8090e (patch)
treedb2511d78fd33d4a88bcfb8d2c41b9b80de25ffd
parentaf9d0cb2e5ffcd336f9b5c01d46cd6768cff7f28 (diff)
downloadpkgsrc-5c76d2c791a9c94306093f81ab00c56f43b8090e.tar.gz
Do previous in another way: simply define PKG_ADMIN to be the command that
we want it to be.
-rw-r--r--pkgtools/pkg_install/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 5a9f1a9751d..a315ed7b584 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2003/08/31 11:11:20 jlam Exp $
+# $NetBSD: Makefile,v 1.77 2003/08/31 11:55:09 jlam Exp $
# Notes to package maintainers:
#
@@ -34,6 +34,7 @@ VERSION!= ${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \
${FILESDIR}/lib/version.h
PKG_DBDIR?= /var/db/pkg
+PKG_ADMIN= ${SETENV} PKG_DBDIR=${PKG_DBDIR} ${PKG_ADMIN_CMD}
.if ${OPSYS} == "NetBSD" && !exists(/usr/share/tmac/tmac.andoc)
PKG_FAIL_REASON+= "You need to have the 'text' set installed to build this package!"
@@ -47,8 +48,7 @@ post-install:
if [ ! -d ${PKG_DBDIR} ]; then \
${INSTALL_DATA_DIR} ${PKG_DBDIR}; \
fi; \
- ${SETENV} PKG_DBDIR=${PKG_DBDIR} \
- ${PKG_ADMIN_CMD} rebuild; \
+ ${PKG_ADMIN} rebuild; \
fi
.include "../../mk/bsd.pkg.mk"