summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd>2002-09-23 13:41:15 +0000
committermarkd <markd>2002-09-23 13:41:15 +0000
commit4a1666630589e3429e75ecc7bb42fed9e29f0ba6 (patch)
treecaa134570c48a3ebbb9a9b5dbcfee75c4703db88
parent3d6598896314a80be7b3615548e0e98dcb1304fe (diff)
downloadpkgsrc-4a1666630589e3429e75ecc7bb42fed9e29f0ba6.tar.gz
find ... -or ... -> find ... -o ... for more portability.
-rw-r--r--math/R/Makefile4
-rw-r--r--math/R/Makefile.extension4
2 files changed, 4 insertions, 4 deletions
diff --git a/math/R/Makefile b/math/R/Makefile
index 6a8c15c1c95..15cba516c73 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/09/09 00:59:00 markd Exp $
+# $NetBSD: Makefile,v 1.38 2002/09/23 13:41:15 markd Exp $
DISTNAME= R-1.5.1
CATEGORIES= math
@@ -92,7 +92,7 @@ post-install:
${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
( cd ${PREFIX}; \
for dir in ${INSTALL_DIRS}; do \
- ${FIND} $${dir#${PREFIX}/} \( -type f -or -type l \) -print; \
+ ${FIND} $${dir#${PREFIX}/} \( -type f -o -type l \) -print; \
done; \
) | ${GREP} -v "lib/R/doc/html/packages.html" | \
${GREP} -v "lib/R/doc/html/search/index.txt" | \
diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension
index a22b00484d1..f4aeada6de1 100644
--- a/math/R/Makefile.extension
+++ b/math/R/Makefile.extension
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.1 2002/04/23 01:14:49 markd Exp $
+# $NetBSD: Makefile.extension,v 1.2 2002/09/23 13:41:15 markd Exp $
#
# This Makefile fragment is included by packages for R library packages.
#
@@ -28,7 +28,7 @@ R_LIB= lib/R/library
R_INST_DIRS?= ${R_PKGNAME}
R_PACKLIST_FILES= ( cd ${PREFIX}; for dir in ${R_INST_DIRS}; do \
- ${FIND} ${R_LIB}/$${dir} \( -type f -or -type l \) -print; done ) | ${SORT} -u
+ ${FIND} ${R_LIB}/$${dir} \( -type f -o -type l \) -print; done ) | ${SORT} -u
R_PACKLIST_DIRS= ( cd ${PREFIX}; for dir in ${R_INST_DIRS}; do \
${FIND} ${R_LIB}/$${dir} -type d -print; done ) | ${SORT} -ur | ${SED} -e "s|^|@dirrm |"
R_PACKLIST_CMDS= ( ${ECHO} '@exec R CMD ${PERL5} %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null'; \