From a2d478624567e00e879b26d6be18b39e42534fc7 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 21 Sep 2002 23:31:41 +0000
Subject: Don't strip past non-whitespace characters.

---
 mk/buildlink2/bsd.buildlink2.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index 82b960ea6d1..a3d8e7db9f5 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.26 2002/09/21 23:19:23 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.27 2002/09/21 23:31:41 jlam Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -383,9 +383,13 @@ _BLNK_UNTRANSFORM_SED.3+=	${_BLNK_TRANSFORM_SED.r}
 #
 .if defined(_USE_RPATH) && empty(_USE_RPATH:M[yY][eE][sS])
 _BLNK_TRANSFORM_SED.3+= \
-	-e "s|-Wl,-R/.*||g" -e "s|-R/.*||g" -e "s|-Wl,-rpath,.*||g"
+	-e "s|-Wl,-R/[^ 	]*||g"					\
+	-e "s|-R/[^ 	]*||g"						\
+	-e "s|-Wl,-rpath,[^ 	]*||g"
 _BLNK_UNTRANSFORM_SED.3+= \
-	-e "s|-Wl,-R/.*||g" -e "s|-R/.*||g" -e "s|-Wl,-rpath,.*||g"
+	-e "s|-Wl,-R/[^ 	]*||g"					\
+	-e "s|-R/[^ 	]*||g"						\
+	-e "s|-Wl,-rpath,[^ 	]*||g"
 .endif
 #
 # Explicitly remove "-I/usr/include" and "-L/usr/lib" as they're redundant.
-- 
cgit v1.2.3