From 1735fcbc283101db15f1075d5da82fe7856be21d Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 28 Aug 2003 10:29:09 +0000
Subject: Avoid removing bare -[ILR], etc.  You're allowed to put a space
 between the option flag and the directory that follows it.

---
 mk/buildlink3/gen-transform.sh | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh
index c45307b31f7..38f08b619c0 100644
--- a/mk/buildlink3/gen-transform.sh
+++ b/mk/buildlink3/gen-transform.sh
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.1.2.4 2003/08/28 10:21:52 jlam Exp $
+# $NetBSD: gen-transform.sh,v 1.1.2.5 2003/08/28 10:29:09 jlam Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -122,6 +122,15 @@ s|\($2/[^ 	"':;]*\)/lib\([^ 	/"':;]*\)\.[0-9]*\.dylib|-L\1 -l\2|g
 s|\($2\)/lib\([^ 	/"':;]*\)\.[0-9]*\.dylib|-L\1 -l\2|g
 s|\($2/[^ 	"':;]*\)/lib\([^ 	/"':;]*\)\.dylib|-L\1 -l\2|g
 s|\($2\)/lib\([^ 	/"':;]*\)\.dylib|-L\1 -l\2|g
+EOF
+			;;
+		esac
+		;;
+	__r)
+		case "$action" in
+		transform|untransform)
+			@CAT@ >> $sedfile << EOF
+s|$2/[^ 	"':;]*||g
 EOF
 			;;
 		esac
@@ -138,12 +147,16 @@ EOF
 		esac
 		;;
 	r)
-		gen $action _r:-I$2
-		gen $action _r:-L$2
-		gen $action _r:-Wl,-rpath-link,$2
-		gen $action _r:-Wl,-rpath,$2
-		gen $action _r:-Wl,-R$2
-		gen $action _r:-R$2
+		case "$2" in
+		"")	r=__r ;;
+		*)	r=_r ;;
+		esac
+		gen $action $r:-I$2
+		gen $action $r:-L$2
+		gen $action $r:-Wl,-rpath-link,$2
+		gen $action $r:-Wl,-rpath,$2
+		gen $action $r:-Wl,-R$2
+		gen $action $r:-R$2
 		;;
 	S)
 		case "$action" in
-- 
cgit v1.2.3