diff options
| author | agc <agc@pkgsrc.org> | 2001-11-09 08:58:19 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2001-11-09 08:58:19 +0000 |
| commit | 7f77b835bfc34bf2e0530b330d482589fed44be1 (patch) | |
| tree | 9292a082394214a9bb0ffc368e456c31b540e63d | |
| parent | 981d773ea35de36abe882f805b3ce175574c1877 (diff) | |
| download | pkgsrc-7f77b835bfc34bf2e0530b330d482589fed44be1.tar.gz | |
Check for DESCR_SRC, PLIST_SRC, MESSAGE_SRC, DEINSTALL and INSTALL files
in ${.CURDIR} as well as ${PKGDIR}, just in case the pkg/ directory still
exists but is empty.
| -rw-r--r-- | mk/bsd.pkg.mk | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 32747f698a8..1c70aa6416d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.844 2001/11/08 12:47:12 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.845 2001/11/09 08:58:19 agc Exp $ # # This file is in the public domain. # @@ -517,9 +517,21 @@ COMMENT!= (${CAT} ${PKGDIR}/COMMENT || ${ECHO} -n "(no description)") 2>/dev/nul .endif 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 @@ -555,17 +567,23 @@ 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 # Set MESSAGE_SRC to be the name of any MESSAGE file, if ${MESSAGE} # hasn't be defined .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) |