diff options
| author | jlam <jlam> | 2003-07-28 21:53:15 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-07-28 21:53:15 +0000 |
| commit | 3835c1c59ef38f4a058f8c34ffc72f3e959a9d1b (patch) | |
| tree | 1028d7c80013cd9348123746ab419855b2a0210d /mk/bsd.pkg.mk | |
| parent | cdf13f3090d9c9fc494af316aa89b803d919b63c (diff) | |
| download | pkgsrc-3835c1c59ef38f4a058f8c34ffc72f3e959a9d1b.tar.gz | |
Call fake-pkg target with correct PKG_DBDIR settings in the "overwrite"
case so that "make install" in a "overwrite" package will still write the
metadata into the correct dbdir.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 270e9d71f6f..9594f033b35 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1216.2.8 2003/07/25 18:49:23 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1216.2.9 2003/07/28 21:53:15 jlam Exp $ # # This file is in the public domain. # @@ -110,6 +110,7 @@ DEPOTBASE= ${X11PREFIX}/${DEPOT_SUBDIR} DEPOTBASE= ${LOCALBASE}/${DEPOT_SUBDIR} . endif PREFIX= ${DEPOTBASE}/${PKGNAME} +PKG_DBDIR_MAKEFLAGS= _REAL_PKG_DBDIR=${PKG_DBDIR} PKG_DBDIR=${DEPOTBASE} NO_MTREE= yes PLIST_SRC= # empty, since we use dynamic PLIST generation # @@ -2513,11 +2514,11 @@ real-su-install: ${MESSAGE} @${ECHO_MSG} "" .endif .if !defined(NO_PKG_REGISTER) - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} _REAL_PKG_DBDIR=${PKG_DBDIR} PKG_DBDIR=${DEPOTBASE} fake-pkg + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} ${PKG_DBDIR_MAKEFLAGS} fake-pkg .endif # !NO_PKG_REGISTER ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE} .if defined(PKG_DEVELOPER) && (${CHECK_SHLIBS} == "YES") - @${MAKE} ${MAKEFLAGS} _REAL_PKG_DBDIR=${PKG_DBDIR} PKG_DBDIR=${DEPOTBASE} check-shlibs + ${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} ${PKG_DBDIR_MAKEFLAGS} check-shlibs .endif |