diff options
| author | rillig <rillig@pkgsrc.org> | 2020-05-21 18:48:43 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-05-21 18:48:43 +0000 |
| commit | 6b8380697ae6e844130fc95577bf090a084ab9d1 (patch) | |
| tree | 28b75905fbbfe93d0df7175e6ab03c8cabf952e1 /mk | |
| parent | c732598bfc680965bcfd3cb38a285116e5c3542a (diff) | |
| download | pkgsrc-6b8380697ae6e844130fc95577bf090a084ab9d1.tar.gz | |
mk/pkgformat/metadata.mk: fix relative paths in PATCHDIR and FILESDIR
Before, relative paths had been stored as-is. This affected those
packages that defined PATCHDIR or FILESDIR as relative directory instead
of prefixing it with ${.CURDIR}.
Since there are already several other paths that are interpreted relative
to the package directory (CONFLICTS, DEPENDS), allow PATCHDIR and
FILESDIR to be specified as relative paths, too. This makes the package
Makefiles a bit shorter.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pkgformat/pkg/metadata.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/pkgformat/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk index eef6b283ed0..94b4786ed06 100644 --- a/mk/pkgformat/pkg/metadata.mk +++ b/mk/pkgformat/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.24 2020/05/15 22:13:39 maya Exp $ +# $NetBSD: metadata.mk,v 1.25 2020/05/21 18:48:43 rillig Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -175,7 +175,7 @@ ${_BUILD_VERSION_FILE}: ${RUN}${RM} -f ${.TARGET}.tmp ${RUN} \ exec 1>>${.TARGET}.tmp; \ - for f in ${.CURDIR}/Makefile ${FILESDIR}/* ${PKGDIR}/*; do \ + for f in ${.CURDIR}/Makefile ${FILESDIR:tA}/* ${PKGDIR:tA}/*; do \ ${TEST} ! -f "$$f" || ${ECHO} "$$f"; \ done ${RUN} \ @@ -185,7 +185,7 @@ ${_BUILD_VERSION_FILE}: ${AWK} 'NF == 4 && $$3 == "=" { gsub("[()]", "", $$2); print $$2 }' | \ while read file; do \ ${TEST} ! -f "${PATCHDIR}/$$file" || \ - ${ECHO} "${PATCHDIR}/$$file"; \ + ${ECHO} "${PATCHDIR:tA}/$$file"; \ done ${RUN} \ exec 1>>${.TARGET}.tmp; \ @@ -193,7 +193,7 @@ ${_BUILD_VERSION_FILE}: cd ${PATCHDIR}; for f in *; do \ case "$$f" in \ "*"|*.orig|*.rej|*~) ;; \ - patch-*) ${ECHO} "${PATCHDIR}/$$f" ;; \ + patch-*) ${ECHO} "${PATCHDIR:tA}/$$f" ;; \ esac; \ done ${RUN} \ |