pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Fix previous properly:
details: https://anonhg.NetBSD.org/pkgsrc/rev/af0f89e94fa2
branches: trunk
changeset: 332199:af0f89e94fa2
user: maya <maya%pkgsrc.org@localhost>
date: Sat Apr 06 06:55:18 2019 +0000
description:
Fix previous properly:
Avoid matching newly created files in destdir and re-installing them
and erroring on install.
find | xargs achieves the same by coincidence.
suggested by kre.
diffstat:
mk/fonts.mk | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (22 lines):
diff -r 4ceda15ecaa0 -r af0f89e94fa2 mk/fonts.mk
--- a/mk/fonts.mk Sat Apr 06 00:56:05 2019 +0000
+++ b/mk/fonts.mk Sat Apr 06 06:55:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fonts.mk,v 1.13 2019/04/04 10:27:35 maya Exp $
+# $NetBSD: fonts.mk,v 1.14 2019/04/06 06:55:18 maya Exp $
#
# Install .otf and .ttf font files.
#
@@ -20,8 +20,8 @@
install-fonts:
${STEP_MSG} "Installing all .otf and .ttf files from " ${WRKSRC}
- ${FIND} ${WRKSRC} -iname '*.ttf' -print | \
- ${XARGS} -I % ${INSTALL_DATA} % ${DESTDIR}${TTF_FONTS_DIR}
- ${FIND} ${WRKSRC} -iname '*.otf' -print | \
- ${XARGS} -I % ${INSTALL_DATA} % ${DESTDIR}${OTF_FONTS_DIR}
+ ${FIND} ${WRKSRC} -name ${DESTDIR:T} -prune -o -iname '*.ttf' -exec \
+ ${INSTALL_DATA} "{}" ${DESTDIR}${TTF_FONTS_DIR} ";"
+ ${FIND} ${WRKSRC} -name ${DESTDIR:T} -prune -o -iname '*.otf' -exec \
+ ${INSTALL_DATA} "{}" ${DESTDIR}${OTF_FONTS_DIR} ";"
Home |
Main Index |
Thread Index |
Old Index