diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-22 18:41:46 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-22 18:41:46 +0000 |
| commit | 04a975cdc28be44bf7fa0ba4727057f7329bcdad (patch) | |
| tree | 22461adf7445abfe424152d0a05c455081e0eab8 | |
| parent | 2ed7a86f4217aa8d11b40381f9738c9788e6eee5 (diff) | |
| download | pkgsrc-04a975cdc28be44bf7fa0ba4727057f7329bcdad.tar.gz | |
Replace the -and/-or options with -a/-o as the former don't work with
Solaris find. The latter work across Solaris/NetBSD/Linux. Patch
received in private e-mail from Stoned Elipot <seb@netbsd.org>.
| -rw-r--r-- | mk/bsd.buildlink.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk index 405d664e58a..6d17a4890fc 100644 --- a/mk/bsd.buildlink.mk +++ b/mk/bsd.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink.mk,v 1.43 2001/10/20 03:00:16 jlam Exp $ +# $NetBSD: bsd.buildlink.mk,v 1.44 2001/10/22 18:41:46 jlam Exp $ # # This Makefile fragment is included by package buildlink.mk files. This # file does the following things: @@ -244,7 +244,7 @@ MAKEFILE_PATTERNS+= *.mk .if (${OBJECT_FMT} == "a.out") REPLACE_LIBNAME_PATTERNS+= ${MAKEFILE_PATTERNS} REPLACE_LIBNAME_PATTERNS_FIND= \ - ${REPLACE_LIBNAME_PATTERNS:S/$/!/:S/^/-or -name !/:S/!/"/g:S/-or//1} + ${REPLACE_LIBNAME_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} REPLACE_LIBNAMES+= \ `cd ${WRKSRC}; ${FIND} . ${REPLACE_LIBNAME_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}` @@ -284,7 +284,7 @@ replace-libnames-makefiles: REPLACE_RPATH_PATTERNS+= ${MAKEFILE_PATTERNS} REPLACE_RPATH_PATTERNS_FIND= \ - ${REPLACE_RPATH_PATTERNS:S/$/!/:S/^/-or -name !/:S/!/"/g:S/-or//1} + ${REPLACE_RPATH_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} REPLACE_RPATH+= \ `cd ${WRKSRC}; ${FIND} . ${REPLACE_RPATH_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}` @@ -323,7 +323,7 @@ REPLACE_BUILDLINK_PATTERNS+= *-config REPLACE_BUILDLINK_PATTERNS+= *Conf.sh REPLACE_BUILDLINK_PATTERNS+= *.pc REPLACE_BUILDLINK_PATTERNS_FIND= \ - ${REPLACE_BUILDLINK_PATTERNS:S/$/!/:S/^/-or -name !/:S/!/"/g:S/-or//1} + ${REPLACE_BUILDLINK_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} REPLACE_BUILDLINK+= \ `cd ${WRKSRC}; ${FIND} . ${REPLACE_BUILDLINK_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}` |