summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2001-10-20 03:00:16 +0000
committerjlam <jlam>2001-10-20 03:00:16 +0000
commit585d53770fbc5026f6e978f3685da1bd87c1b545 (patch)
tree4e8c9dcc579a2c55f1365e2fdc00d69390368da4 /mk
parentb08bb324530fb4fdad4bec252bfef80858ffd9f2 (diff)
downloadpkgsrc-585d53770fbc5026f6e978f3685da1bd87c1b545.tar.gz
Some Makefiles separate -R and the rpath directory with whitespace, so
handle that case.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.buildlink.mk4
-rw-r--r--mk/x11.buildlink.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk
index dd3fba66931..405d664e58a 100644
--- a/mk/bsd.buildlink.mk
+++ b/mk/bsd.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink.mk,v 1.42 2001/10/09 14:07:41 jlam Exp $
+# $NetBSD: bsd.buildlink.mk,v 1.43 2001/10/20 03:00:16 jlam Exp $
#
# This Makefile fragment is included by package buildlink.mk files. This
# file does the following things:
@@ -290,7 +290,7 @@ REPLACE_RPATH+= \
`cd ${WRKSRC}; ${FIND} . ${REPLACE_RPATH_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}`
REPLACE_RPATH_SED+= \
- -e "s|-R${BUILDLINK_DIR}/|-R${LOCALBASE}/|g"
+ -e "s|-R[ ]*${BUILDLINK_DIR}/|-R${LOCALBASE}/|g"
post-configure: replace-rpath
diff --git a/mk/x11.buildlink.mk b/mk/x11.buildlink.mk
index 38ac0ad73e8..ed17f513e58 100644
--- a/mk/x11.buildlink.mk
+++ b/mk/x11.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink.mk,v 1.8 2001/10/09 18:18:52 jlam Exp $
+# $NetBSD: x11.buildlink.mk,v 1.9 2001/10/20 03:00:16 jlam Exp $
#
# This Makefile fragment is included by packages that use X11.
#
@@ -84,6 +84,6 @@ REPLACE_BUILDLINK_POST_SED+= \
-e "s|-L${BUILDLINK_X11_DIR}/|-L${X11BASE}/|g"
REPLACE_RPATH_SED+= \
- -e "s|-R${BUILDLINK_X11_DIR}/|-R${X11BASE}/|g"
+ -e "s|-R[ ]*${BUILDLINK_X11_DIR}/|-R${X11BASE}/|g"
.endif # X11_BUILDLINK_MK