diff options
Diffstat (limited to 'lang/gcc3-objc')
-rw-r--r-- | lang/gcc3-objc/buildlink2.mk | 28 | ||||
-rw-r--r-- | lang/gcc3-objc/buildlink3.mk | 28 |
2 files changed, 28 insertions, 28 deletions
diff --git a/lang/gcc3-objc/buildlink2.mk b/lang/gcc3-objc/buildlink2.mk index e636c85214a..774980952a7 100644 --- a/lang/gcc3-objc/buildlink2.mk +++ b/lang/gcc3-objc/buildlink2.mk @@ -1,35 +1,35 @@ -# $NetBSD: buildlink2.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2004/03/18 04:19:39 jlam Exp $ -.if !defined(GCC3OBJC_BUILDLINK2_MK) -GCC3OBJC_BUILDLINK2_MK= # defined +.if !defined(GCC3_OBJC_BUILDLINK2_MK) +GCC3_OBJC_BUILDLINK2_MK= # defined .include "../../mk/bsd.prefs.mk" .if defined(GCC3_INSTALLTO_SUBPREFIX) GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} .endif -BUILDLINK_PACKAGES+= gcc3objc -BUILDLINK_DEPENDS.gcc3objc?= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD} -BUILDLINK_PKGSRCDIR.gcc3objc?= ../../lang/gcc3-objc +BUILDLINK_PACKAGES+= gcc3-objc +BUILDLINK_DEPENDS.gcc3-objc?= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD} +BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc # Packages that link against gcc shared libraries need a full # dependency. # .if defined(USE_GCC_SHLIB) -BUILDLINK_DEPMETHOD.gcc3objc+= full +BUILDLINK_DEPMETHOD.gcc3-objc+= full .else -BUILDLINK_DEPMETHOD.gcc3objc?= build +BUILDLINK_DEPMETHOD.gcc3-objc?= build .endif -BUILDLINK_PREFIX.gcc3objc= ${LOCALBASE} +BUILDLINK_PREFIX.gcc3-objc= ${LOCALBASE} BUILDLINK_WRAPPER_ENV+= \ COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH -BUILDLINK_FILES.gcc3objc= ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/objc/* -BUILDLINK_FILES.gcc3objc+= ${_GCC_SUBPREFIX}/lib/libobjc.* +BUILDLINK_FILES.gcc3-objc= ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/objc/* +BUILDLINK_FILES.gcc3-objc+= ${_GCC_SUBPREFIX}/lib/libobjc.* -BUILDLINK_TARGETS+= gcc3objc-buildlink +BUILDLINK_TARGETS+= gcc3-objc-buildlink -gcc3objc-buildlink: _BUILDLINK_USE +gcc3-objc-buildlink: _BUILDLINK_USE -.endif # GCC3OBJC_BUILDLINK2_MK +.endif # GCC3_OBJC_BUILDLINK2_MK diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index 0ef61dda643..feb6ed62b2f 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -1,36 +1,36 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC3OBJC_BUILDLINK3_MK:= ${GCC3OBJC_BUILDLINK3_MK}+ +GCC3_OBJC_BUILDLINK3_MK:= ${GCC3_OBJC_BUILDLINK3_MK}+ .include "../../mk/bsd.prefs.mk" .if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc3objc +BUILDLINK_DEPENDS+= gcc3-objc .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3objc} -BUILDLINK_PACKAGES+= gcc3objc +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-objc} +BUILDLINK_PACKAGES+= gcc3-objc -.if !empty(GCC3OBJC_BUILDLINK3_MK:M+) +.if !empty(GCC3_OBJC_BUILDLINK3_MK:M+) . if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif . endif -BUILDLINK_PKGBASE.gcc3objc?= gcc3${GCC3_PKGMODIF}-objc -BUILDLINK_DEPENDS.gcc3objc+= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD} -BUILDLINK_PKGSRCDIR.gcc3objc?= ../../lang/gcc3-objc -BUILDLINK_LIBDIRS.gcc3objc?= \ - lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3objc}\///} +BUILDLINK_PKGBASE.gcc3-objc?= gcc3${GCC3_PKGMODIF}-objc +BUILDLINK_DEPENDS.gcc3-objc+= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD} +BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc +BUILDLINK_LIBDIRS.gcc3-objc?= \ + lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///} # Packages that link against shared libraries need a full dependency. .if defined(USE_GCC_SHLIB) -BUILDLINK_DEPMETHOD.gcc3objc+= full +BUILDLINK_DEPMETHOD.gcc3-objc+= full .else -BUILDLINK_DEPMETHOD.gcc3objc?= build +BUILDLINK_DEPMETHOD.gcc3-objc?= build .endif -.endif # GCC3OBJC_BUILDLINK3_MK +.endif # GCC3_OBJC_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |