From f583326768e1b979d978e22af342faf38fbd654c Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 21 Jan 2004 07:54:50 +0000
Subject: Rename 'submangle' to 'sub-mangle'

---
 mk/buildlink3/bsd.buildlink3.mk | 12 ++++++------
 mk/buildlink3/gen-transform.sh  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'mk')

diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index ae26178e139..b6eaf0267fd 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.51 2004/01/21 07:37:32 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.52 2004/01/21 07:54:50 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -728,8 +728,8 @@ _BLNK_TRANSFORM+=	mangle:${_dir_}:${_BLNK_MANGLE_DIR.${_dir_}}
 # Protect -I/usr/include/* and -L/usr/lib/* from transformations (these
 # aren't part of the normal header or library search paths).
 #
-_BLNK_TRANSFORM+=	submangle:-I/usr/include:-I${_BLNK_MANGLE_DIR./usr/include}
-_BLNK_TRANSFORM+=	submangle:-L/usr/lib:-L${_BLNK_MANGLE_DIR./usr/lib}
+_BLNK_TRANSFORM+=	sub-mangle:-I/usr/include:-I${_BLNK_MANGLE_DIR./usr/include}
+_BLNK_TRANSFORM+=	sub-mangle:-L/usr/lib:-L${_BLNK_MANGLE_DIR./usr/lib}
 #
 # Change any buildlink directories in runtime library search paths into
 # the canonical actual installed paths.
@@ -786,11 +786,11 @@ _BLNK_TRANSFORM+=	L:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
 # Protect any remaining references to ${PREFIX}, ${LOCALBASE}, or ${X11BASE}.
 #
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
-_BLNK_TRANSFORM+=	untransform:submangle:${PREFIX}:${_BLNK_MANGLE_DIR.${PREFIX}}
+_BLNK_TRANSFORM+=	untransform:sub-mangle:${PREFIX}:${_BLNK_MANGLE_DIR.${PREFIX}}
 .endif
-_BLNK_TRANSFORM+=	untransform:submangle:${LOCALBASE}:${_BLNK_MANGLE_DIR.${LOCALBASE}}
+_BLNK_TRANSFORM+=	untransform:sub-mangle:${LOCALBASE}:${_BLNK_MANGLE_DIR.${LOCALBASE}}
 .if defined(USE_X11)
-_BLNK_TRANSFORM+=	untransform:submangle:${X11BASE}:${_BLNK_MANGLE_DIR.${X11BASE}}
+_BLNK_TRANSFORM+=	untransform:sub-mangle:${X11BASE}:${_BLNK_MANGLE_DIR.${X11BASE}}
 .endif
 #
 # Add any package specified transformations (l:, etc.)
diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh
index f511d207921..36afeed1fd9 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.15 2004/01/19 10:09:36 jlam Exp $
+# $NetBSD: gen-transform.sh,v 1.16 2004/01/21 07:54:50 jlam Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -9,7 +9,7 @@ untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
 # equivalents:
 #
 #	mangle:src:dst		mangles the directory "src" into "dst"
-#	submangle:src:dst	mangles "src/*" into "dst/*"
+#	sub-mangle:src:dst	mangles "src/*" into "dst/*"
 #	rpath:src:dst		translates the directory "src" into "dst"
 #					in rpath options
 #	abs-rpath		removes all rpath options that try to add
@@ -64,7 +64,7 @@ EOF
 			;;
 		esac
 		;;
-	submangle)
+	sub-mangle)
 		case "$action" in
 		transform|untransform)
 			@CAT@ >> $sedfile << EOF
-- 
cgit v1.2.3