diff options
| author | taca <taca@pkgsrc.org> | 2015-12-17 01:40:54 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2015-12-17 01:40:54 +0000 |
| commit | 38032135ab71fa8ad7e86cff72081d8bcf77b1da (patch) | |
| tree | c7670097378bf3ce07122ed30377fdcec2a100f0 /lang/pear | |
| parent | 75ed96fec22b65ce61ecb6cadedc775c684fd2fc (diff) | |
| download | pkgsrc-38032135ab71fa8ad7e86cff72081d8bcf77b1da.tar.gz | |
Take care of DIST_SUBDIR when accessing DISTFILES.
Problem was noted by joerg@ and patch was suggested by Robert Elz.
Diffstat (limited to 'lang/pear')
| -rw-r--r-- | lang/pear/Makefile | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lang/pear/Makefile b/lang/pear/Makefile index 1e5d8a2a64c..6da849da0df 100644 --- a/lang/pear/Makefile +++ b/lang/pear/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2015/12/15 15:09:01 taca Exp $ +# $NetBSD: Makefile,v 1.36 2015/12/17 01:40:54 taca Exp $ # DISTNAME= PEAR-1.10.1 @@ -71,17 +71,10 @@ post-extract: ${CP} ${FILESDIR}/PEAR.php ${BUNDLE} do-build: - ${GZCAT} ${DISTDIR}/${ARCHIVE_SRCS} > \ - ${BUNDLE}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}/.tar/} - ${GZCAT} ${DISTDIR}/${CONSOLE_SRCS} > \ - ${BUNDLE}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}/.tar/} - ${GZCAT} ${DISTDIR}/${PEAR_SRCS} > \ - ${BUNDLE}/${PEAR_SRCS:S/${EXTRACT_SUFX}/.tar/} - ${GZCAT} ${DISTDIR}/${STRUCTURES_SRCS} > \ - ${BUNDLE}/${STRUCTURES_SRCS:S/${EXTRACT_SUFX}/.tar/} - ${GZCAT} ${DISTDIR}/${XMLUTIL_SRCS} > \ - ${BUNDLE}/${XMLUTIL_SRCS:S/${EXTRACT_SUFX}/.tar/} - +.for f in ${DISTFILES} + ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f} > \ + ${BUNDLE}/${f:S/${EXTRACT_SUFX}/.tar/} +.endfor ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE} ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE} |