summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorseb <seb>2002-01-23 13:05:51 +0000
committerseb <seb>2002-01-23 13:05:51 +0000
commit33880610178628605e4e0e281882da84253f7d45 (patch)
tree01c516e8a373066e1d7054973e82cb7dbd5d8fc1 /mk
parentf1a1caa7ff3f18b0273f7dfd006b057d46f8b7a8 (diff)
downloadpkgsrc-33880610178628605e4e0e281882da84253f7d45.tar.gz
Continue the trend removing the temporary ${PKGDIR} workaround.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 9ccd2858263..eccbfffb929 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.911 2002/01/22 18:15:20 dmcmahill Exp $
+# $NetBSD: bsd.pkg.mk,v 1.912 2002/01/23 13:05:51 seb Exp $
#
# This file is in the public domain.
#
@@ -523,15 +523,11 @@ PLIST_SUBST+= PERL5_ARCHLIB=${PERL5_ARCHLIB:S/^${LOCALBASE}\///}
# Set INSTALL_FILE to be the name of any INSTALL file
.if !defined(INSTALL_FILE) && exists(${PKGDIR}/INSTALL)
INSTALL_FILE= ${PKGDIR}/INSTALL
-.elif !defined(INSTALL_FILE) && exists(${.CURDIR}/INSTALL)
-INSTALL_FILE= ${.CURDIR}/INSTALL
.endif
# Set DEINSTALL_FILE to be the name of any DEINSTALL file
.if !defined(DEINSTALL_FILE) && exists(${PKGDIR}/DEINSTALL)
DEINSTALL_FILE= ${PKGDIR}/DEINSTALL
-.elif !defined(DEINSTALL_FILE) && exists(${.CURDIR}/DEINSTALL)
-DEINSTALL_FILE= ${.CURDIR}/DEINSTALL
.endif
# If MESSAGE hasn't been defined, then set MESSAGE_SRC to be a space-separated
@@ -539,8 +535,6 @@ DEINSTALL_FILE= ${.CURDIR}/DEINSTALL
#
.if !defined(MESSAGE_SRC) && !defined(MESSAGE) && exists(${PKGDIR}/MESSAGE)
MESSAGE_SRC= ${PKGDIR}/MESSAGE
-.elif !defined(MESSAGE_SRC) && !defined(MESSAGE) && exists(${.CURDIR}/MESSAGE)
-MESSAGE_SRC= ${.CURDIR}/MESSAGE
.endif
.if defined(MESSAGE_SRC)