Rename the internal package variable referred to by buildlink[23]. No

functional change.

2 files changed, 33 insertions, 33 deletions

diff --git a/lang/gcc3-c/buildlink2.mk b/lang/gcc3-c/buildlink2.mk
index 755fcde4191..316483fde40 100644
--- a/lang/gcc3-c/buildlink2.mk
+++ b/lang/gcc3-c/buildlink2.mk
@@ -1,40 +1,40 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/02/21 10:37:27 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/03/18 04:19:39 jlam Exp $
 
-.if !defined(GCC3C_BUILDLINK2_MK)
-GCC3C_BUILDLINK2_MK=	# defined
+.if !defined(GCC3_C_BUILDLINK2_MK)
+GCC3_C_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
 .endif
-BUILDLINK_PACKAGES+=		gcc3c
-BUILDLINK_DEPENDS.gcc3c?=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3c?=	../../lang/gcc3-c
+BUILDLINK_PACKAGES+=		gcc3-c
+BUILDLINK_DEPENDS.gcc3-c?=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-c?=	../../lang/gcc3-c
 
 # Packages that link against gcc shared libraries need a full
 # dependency.
 #
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3c+=	full
+BUILDLINK_DEPMETHOD.gcc3-c+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3c?=	build
+BUILDLINK_DEPMETHOD.gcc3-c?=	build
 .endif
 
-BUILDLINK_PREFIX.gcc3c=	${LOCALBASE}
+BUILDLINK_PREFIX.gcc3-c=	${LOCALBASE}
 BUILDLINK_WRAPPER_ENV+=	\
 	COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
-BUILDLINK_FILES.gcc3c=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*/*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/lib*.*
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/specs
-BUILDLINK_FILES.gcc3c+=	${_GCC_SUBPREFIX}lib/libgcc_s.*
+BUILDLINK_FILES.gcc3-c=	${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/lib*.*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/specs
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/libgcc_s.*
 
-BUILDLINK_PRE_TARGETS+=	gcc3c-buildlink
+BUILDLINK_PRE_TARGETS+=	gcc3-c-buildlink
 
-gcc3c-buildlink: _BUILDLINK_USE
+gcc3-c-buildlink: _BUILDLINK_USE
 
-.endif	# GCC3C_BUILDLINK2_MK
+.endif	# GCC3_C_BUILDLINK2_MK
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 9e75b1ab15b..7400e8aa181 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,18 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 04:19:39 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GCC3C_BUILDLINK3_MK:=	${GCC3C_BUILDLINK3_MK}+
+GCC3_C_BUILDLINK3_MK:=	${GCC3_C_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gcc3c
+BUILDLINK_DEPENDS+=	gcc3-c
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3c}
-BUILDLINK_PACKAGES+=	gcc3c
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3-c}
+BUILDLINK_PACKAGES+=	gcc3-c
 
-.if !empty(GCC3C_BUILDLINK3_MK:M+)
+.if !empty(GCC3_C_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 #
 # "gcc3" is the directory named in pkgsrc/lang/gcc3-c/Makefile.common"
@@ -22,19 +22,19 @@ BUILDLINK_PACKAGES+=	gcc3c
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PKGBASE.gcc3c?=	gcc3${GCC3_PKGMODIF}-c
-BUILDLINK_DEPENDS.gcc3c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3c?=	../../lang/gcc3-c
-BUILDLINK_LIBDIRS.gcc3c?=	\
-	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3c}\///}
+BUILDLINK_PKGBASE.gcc3-c?=	gcc3${GCC3_PKGMODIF}-c
+BUILDLINK_DEPENDS.gcc3-c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-c?=	../../lang/gcc3-c
+BUILDLINK_LIBDIRS.gcc3-c?=	\
+	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3c+=	full
+BUILDLINK_DEPMETHOD.gcc3-c+=	full
 .else
-BUILDLINK_DEPMETHOD.gcc3c?=	build
+BUILDLINK_DEPMETHOD.gcc3-c?=	build
 .endif
 
-.endif	# GCC3C_BUILDLINK3_MK
+.endif	# GCC3_C_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}