diff options
| author | hubertf <hubertf@pkgsrc.org> | 2000-03-09 13:54:50 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2000-03-09 13:54:50 +0000 |
| commit | 4c257865d4e2951281111cb6b134009d07ac99e8 (patch) | |
| tree | 16184afbe78c7309da9c047f1a148c0d52fc6f80 /mk | |
| parent | 74874e66d91680f0a25d9fbfebf815adc6fbdc84 (diff) | |
| download | pkgsrc-4c257865d4e2951281111cb6b134009d07ac99e8.tar.gz | |
Changes to make DESTDIR builds have a bit more chance to survive,
esp. WRT PKG_DBDIR; Plus one comment.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c06b63d32b5..ac805756e1b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.412 2000/03/02 18:35:59 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.413 2000/03/09 13:54:50 hubertf Exp $ # # This file is in the public domain. # @@ -544,10 +544,17 @@ TRUE?= /usr/bin/true TYPE?= type .endif # !SunOS +.if defined(DESTDIR) +PKG_ADD?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_add +PKG_CREATE?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_create +PKG_DELETE?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_delete +PKG_INFO?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_info +.else PKG_ADD?= ${PKG_TOOLS_BIN}/pkg_add PKG_CREATE?= ${PKG_TOOLS_BIN}/pkg_create PKG_DELETE?= ${PKG_TOOLS_BIN}/pkg_delete PKG_INFO?= ${PKG_TOOLS_BIN}/pkg_info +.endif .if !defined(PKGTOOLS_VERSION) .if !exists(${IDENT}) @@ -610,7 +617,7 @@ PKG_ARGS+= -m ${MTREE_FILE} .endif # !PKG_ARGS PKG_SUFX?= .tgz # where pkg_add records its dirty deeds. -PKG_DBDIR?= /var/db/pkg +PKG_DBDIR?= ${DESTDIR}/var/db/pkg # shared/dynamic motif libs MOTIFLIB?= -L${MOTIFBASE}/lib -L${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -lXm @@ -1870,7 +1877,7 @@ clean: pre-clean .ifdef WRKOBJDIR ${_PKG_SILENT}${_PKG_DEBUG}${RM} -rf ${WRKOBJDIR}/${PKGSRC_SUBDIR} -${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${WRKDIR_BASENAME} -.else +.else # WRKOBJDIR ${_PKG_SILENT}${_PKG_DEBUG}if [ -d ${WRKDIR} ]; then \ if [ -w ${WRKDIR} ]; then \ ${RM} -rf ${WRKDIR}; \ |