diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 20 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 9 |
2 files changed, 19 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 306414263e8..ebe2bf4f48c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.164 1998/09/17 14:03:48 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.165 1998/09/17 15:47:08 agc Exp $ # # This file is in the public domain. # @@ -365,6 +365,16 @@ INSTALL_FILE= ${PKGDIR}/INSTALL DEINSTALL_FILE= ${PKGDIR}/DEINSTALL .endif +# Set REQ_FILE to be the name of any REQ file +.if !defined(REQ_FILE) && exists(${PKGDIR}/REQ) +REQ_FILE= ${PKGDIR}/REQ +.endif + +# Set MESSAGE_FILE to be the name of any MESSAGE file +.if !defined(MESSAGE_FILE) && exists(${PKGDIR}/MESSAGE) +MESSAGE_FILE= ${PKGDIR}/MESSAGE +.endif + PKG_CMD?= /usr/sbin/pkg_create .if !defined(PKG_ARGS) PKG_ARGS= -v -c ${COMMENT} -d ${DESCR} -f ${PLIST} -p ${PREFIX} -P "`${MAKE} package-depends|sort -u`" @@ -381,11 +391,11 @@ PKG_ARGS+= -i ${INSTALL_FILE} .ifdef DEINSTALL_FILE PKG_ARGS+= -k ${DEINSTALL_FILE} .endif -.if exists(${PKGDIR}/REQ) -PKG_ARGS+= -r ${PKGDIR}/REQ +.ifdef REQ_FILE +PKG_ARGS+= -r ${REQ_FILE} .endif -.if exists(${PKGDIR}/MESSAGE) -PKG_ARGS+= -D ${PKGDIR}/MESSAGE +.ifdef MESSAGE_FILE +PKG_ARGS+= -D ${MESSAGE_FILE} .endif .if !defined(NO_MTREE) PKG_ARGS+= -m ${MTREE_FILE} diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 3c0dd1596f5..7e7b01c98e0 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/08/23 21:25:19 frueauf Exp $ +# $NetBSD: Makefile,v 1.11 1998/09/17 15:47:09 agc Exp $ # DISTNAME= xpkgwedge-0.4 @@ -12,6 +12,8 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_IMAKE= yes +MESSAGE_FILE= ${WRKDIR}/MESSAGE + pre-extract: @if [ ! -f ${X11BASE}/include/X11/X.h ]; then \ ${ECHO} 'xpkgwedge requires $$X11BASE to point to the real X distribution.'; \ @@ -25,10 +27,7 @@ pre-configure: pre-install: @${SED} -e 's|@@PREFIX@@|${LOCALBASE}|g' < ${PKGDIR}/MESSAGE.pre \ - > ${PKGDIR}/MESSAGE - -pre-clean: - @${RM} -f ${PKGDIR}/MESSAGE + > ${MESSAGE_FILE} .include "../../mk/bsd.pkg.mk" |