diff options
author | jlam <jlam@pkgsrc.org> | 2007-10-25 21:04:21 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2007-10-25 21:04:21 +0000 |
commit | b5e6ca3a7e36bba97ce2153247efaeb97ac6facb (patch) | |
tree | b8aa93dd00c811788670e0756c30a0c0cb8dea62 /fonts/adobe-cidfonts | |
parent | 65d4b8652df4e0ae4c1dad6ea540fe4351790f8b (diff) | |
download | pkgsrc-b5e6ca3a7e36bba97ce2153247efaeb97ac6facb.tar.gz |
Move code that generates a dynamic PLIST from the {pre,do,post}-install
targets and into a GENERATE_PLIST variable definition. Remove some
unnecessary empty PLISTs as a result of properly setting GENERATE_PLIST.
Diffstat (limited to 'fonts/adobe-cidfonts')
-rw-r--r-- | fonts/adobe-cidfonts/Makefile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/fonts/adobe-cidfonts/Makefile b/fonts/adobe-cidfonts/Makefile index 473873cf65c..9671cc49d3f 100644 --- a/fonts/adobe-cidfonts/Makefile +++ b/fonts/adobe-cidfonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:38 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/10/25 21:04:21 jlam Exp $ DISTNAME= adobe-cidfonts-20000901 CATEGORIES= fonts @@ -30,9 +30,15 @@ EXTRACT_ONLY= # empty NO_CONFIGURE= yes NO_BUILD= yes -RESOURCEDIR= ${PREFIX}/share/Adobe/Resource +RESOURCESUBDIR= share/Adobe/Resource +RESOURCEDIR= ${PREFIX}/${RESOURCESUBDIR} -PLIST_SRC= ${WRKDIR}/.PLIST_SRC +GENERATE_PLIST= \ + for f in ${DISTFILES:O:u}; do \ + ${ECHO} ${RESOURCESUBDIR}/CIDFont/$$f; \ + done; \ + ${ECHO} "@dirrm ${RESOURCESUBDIR}/CIDFont"; \ + ${ECHO} "@unexec ${RMDIR} -p %D/${RESOURCESUBDIR} 2>/dev/null || ${TRUE}"; do-install: ${INSTALL_DATA_DIR} ${RESOURCEDIR}/CIDFont @@ -40,13 +46,5 @@ do-install: ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${file} \ ${RESOURCEDIR}/CIDFont; \ done - ${CAT} ${.CURDIR}/PLIST > ${PLIST_SRC} - ( for file in ${DISTFILES}; do \ - ${ECHO} ${RESOURCEDIR:S/^${PREFIX}\///}/CIDFont/$${file}; \ - done; \ - ) | ${SORT} -u >> ${PLIST_SRC} - ( ${ECHO} "@dirrm ${RESOURCEDIR:S/^${PREFIX}\///}/CIDFont"; \ - ${ECHO} "@unexec ${RMDIR} -p %D/${RESOURCEDIR:S/^${PREFIX}\///} 2>/dev/null || ${TRUE}"; \ - ) >> ${PLIST_SRC} .include "../../mk/bsd.pkg.mk" |