diff options
| author | agc <agc@pkgsrc.org> | 2001-11-21 18:32:01 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2001-11-21 18:32:01 +0000 |
| commit | 93549791ee6298d7f2b5a5175b1f0bf050413727 (patch) | |
| tree | 25e7abe7c3c415946bcb9dfc49b4aa25f26b657b | |
| parent | 076673560fdb5c84a3af37801a2c42fdc2901ef2 (diff) | |
| download | pkgsrc-93549791ee6298d7f2b5a5175b1f0bf050413727.tar.gz | |
Now that all the files have been moved into the main package directory,
remove the temporary ${PKGDIR} workaround.
| -rw-r--r-- | mk/bsd.pkg.mk | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 80687aa28ca..6018feb36f0 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.858 2001/11/21 13:44:44 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.859 2001/11/21 18:32:01 agc Exp $ # # This file is in the public domain. # @@ -49,11 +49,7 @@ TEMPLATES?= ${PKGSRCDIR}/templates PATCHDIR?= ${.CURDIR}/patches SCRIPTDIR?= ${.CURDIR}/scripts FILESDIR?= ${.CURDIR}/files -.if exists(${.CURDIR}/pkg) -PKGDIR?= ${.CURDIR}/pkg -.else PKGDIR?= ${.CURDIR} -.endif .if defined(CONFDIR.${PKGBASE}) CONFDIR= ${CONFDIR.${PKGBASE}} @@ -513,19 +509,11 @@ COMMENT!= (${CAT} ${PKGDIR}/COMMENT || ${ECHO} -n "(no description)") 2>/dev/nul DESCR= ${WRKDIR}/.DESCR .if !defined(DESCR_SRC) -. if !exists(${PKGDIR}/DESCR) && exists(${.CURDIR}/DESCR) -DESCR_SRC?= ${.CURDIR}/DESCR -. else DESCR_SRC?= ${PKGDIR}/DESCR -. endif .endif PLIST= ${WRKDIR}/.PLIST .if !defined(PLIST_SRC) -. if !exists(${PKGDIR}/PLIST) && exists(${.CURDIR}/PLIST) -PLIST_SRC?= ${.CURDIR}/PLIST -. else PLIST_SRC?= ${PKGDIR}/PLIST -. endif .endif DLIST= ${WRKDIR}/.DLIST DDIR= ${WRKDIR}/.DDIR |