Some cleanup.

6 files changed, 145 insertions, 156 deletions

diff --git a/lang/gcc/MESSAGE b/lang/gcc/MESSAGE
index 6e8c27e47e9..8ca7a75d142 100644
--- a/lang/gcc/MESSAGE
+++ b/lang/gcc/MESSAGE
@@ -1,7 +1,7 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.2 2002/01/03 20:40:37 tron Exp $
+===========================================================================
+$NetBSD: MESSAGE,v 1.3 2002/03/14 16:21:57 wiz Exp $
 
 To use ${PKGNAME} include "${PREFIX}/etc/${PKGNAME}.mk" in your
 BSD style makefile.
 
-======================================================================
+===========================================================================
diff --git a/lang/gcc/MESSAGE.SunOS b/lang/gcc/MESSAGE.SunOS
index 6207d181bf0..f1653723f36 100644
--- a/lang/gcc/MESSAGE.SunOS
+++ b/lang/gcc/MESSAGE.SunOS
@@ -1,7 +1,7 @@
-======================================================================
-$NetBSD: MESSAGE.SunOS,v 1.1 2001/11/01 00:32:24 zuntum Exp $
+===========================================================================
+$NetBSD: MESSAGE.SunOS,v 1.2 2002/03/14 16:21:57 wiz Exp $
 
 To avoid conflicts with e.g. Sun WorkShop the GNU C compiler can only be
 invoked as "gcc" but not as "cc".
 
-======================================================================
+===========================================================================
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 2a50b6b3f6d..190072d1c63 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/02/18 15:14:25 seb Exp $
+# $NetBSD: Makefile,v 1.36 2002/03/14 16:21:57 wiz Exp $
 
 # Make sure that the version number in "Makefile.gcc" matches this.
 DISTNAME=		gcc-2.95.3
@@ -15,24 +15,14 @@ BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 # If you get gcc working on other platforms, then please add them.
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 SunOS-*-*
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
-MACHINE_GCC_PLATFORM=	${MACHINE_GNU_PLATFORM}elf
-.else
-MACHINE_GCC_PLATFORM=	${MACHINE_GNU_PLATFORM}
-.endif
-
 USE_GMAKE=		YES
 HAS_CONFIGURE=		YES
-CONFIGURE_ARGS=		--host=${MACHINE_GCC_PLATFORM} \
+CONFIGURE_ARGS=		--host=${MACHINE_GNU_PLATFORM} \
 			--prefix=${GCC_PREFIX} \
 			--enable-shared
 CONFIGURE_SCRIPT=	${SRCDIR}/configure
 INFO_FILES=		chill.info cpp.info g77.info gcc.info
 
-MESSAGE_SUBST+=		MAKE=${MAKE}
-PLIST_SUBST+=		MACHINE_GCC_PLATFORM=${MACHINE_GCC_PLATFORM}
 PLIST_SUBST+=		GCC_VERSION=${PKGVERSION}
 SRCDIR=			${WRKDIR}/${DISTNAME}
 WRKSRC=			${WRKDIR}/objdir
@@ -85,16 +75,15 @@ pre-install:
 
 .if (${OPSYS} != SunOS)
 post-install:
-	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/curses.h ${PREFIX}/${PKGNAME}/bin/cc
+	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/curses.h ${PREFIX}/${PKGNAME}/bin/cc
 	${LN} -s gcc ${PREFIX}/${PKGNAME}/bin/cc
-	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/curses.h
 	${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGNAME}.mk
 .else
 # remove empy file and directory that show up when one
 # does make install; make deinstall; make install
 post-install:
-	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/fixed
-	-${RMDIR} ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/v7
+	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/fixed
+	-${RMDIR} ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/v7
 .endif
 
 .include "../../mk/texinfo.mk"
diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST
index 5c4c14890c1..7d2c31e91c4 100644
--- a/lang/gcc/PLIST
+++ b/lang/gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:25 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/03/14 16:21:57 wiz Exp $
 etc/gcc-2.95.3.mk
 ${PKGNAME}/bin/c++
 ${PKGNAME}/bin/c++filt
@@ -11,10 +11,10 @@ ${PKGNAME}/bin/gcc
 ${PKGNAME}/bin/gcj
 ${PKGNAME}/bin/gcjh
 ${PKGNAME}/bin/gcov
-${PKGNAME}/bin/${MACHINE_GCC_PLATFORM}-gcc
+${PKGNAME}/bin/${MACHINE_GNU_PLATFORM}-gcc
 ${PKGNAME}/bin/jcf-dump
 ${PKGNAME}/bin/jv-scan
-${PKGNAME}/${MACHINE_GCC_PLATFORM}/include/_G_config.h
+${PKGNAME}/${MACHINE_GNU_PLATFORM}/include/_G_config.h
 ${PKGNAME}/include/g++-3/PlotFile.h
 ${PKGNAME}/include/g++-3/SFile.h
 ${PKGNAME}/include/g++-3/algo.h
@@ -164,43 +164,43 @@ ${PKGNAME}/include/g++-3/utility
 ${PKGNAME}/include/g++-3/valarray
 ${PKGNAME}/include/g++-3/vector
 ${PKGNAME}/include/g++-3/vector.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cc1
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cc1chill
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cc1obj
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cc1plus
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/chillrt0.o
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/collect2
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/cpp0
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/f771
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/README
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/exception
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/float.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/g2c.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/limits.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/math.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/new
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/new.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/NXConstStr.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/Object.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/Protocol.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/encoding.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/hash.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/objc-api.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/objc-list.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/objc.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/sarray.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/thr.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc/typedstream.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/syslimits.h
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/typeinfo
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/jc1
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/jvgenmain
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libchill.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libg2c.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libgcc.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libobjc.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/libstdc++.a
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/specs
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1chill
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1obj
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1plus
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/chillrt0.o
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/collect2
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cpp0
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/f771
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/README
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/exception
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/float.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/g2c.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/limits.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/math.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/new
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/new.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/NXConstStr.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/Object.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/Protocol.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/encoding.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/hash.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc-api.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc-list.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/sarray.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/thr.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/typedstream.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/syslimits.h
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/typeinfo
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/jc1
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/jvgenmain
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libchill.a
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libg2c.a
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libgcc.a
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libobjc.a
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libstdc++.a
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/specs
 ${PKGNAME}/lib/libiberty.a
 ${PKGNAME}/lib/libstdc++.a.2.10.0nb1
 ${PKGNAME}/man/man1/cccp.1
@@ -274,16 +274,16 @@ info/gcc.info-8
 info/gcc.info-9
 @dirrm ${PKGNAME}/man/man1
 @dirrm ${PKGNAME}/man
-@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/objc
-@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include
-@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}
-@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}
+@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc
+@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include
+@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}
+@dirrm ${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}
 @dirrm ${PKGNAME}/lib/gcc-lib
 @dirrm ${PKGNAME}/lib
 @dirrm ${PKGNAME}/include/g++-3/std
 @dirrm ${PKGNAME}/include/g++-3
 @dirrm ${PKGNAME}/include
-@dirrm ${PKGNAME}/${MACHINE_GCC_PLATFORM}/include
-@dirrm ${PKGNAME}/${MACHINE_GCC_PLATFORM}
+@dirrm ${PKGNAME}/${MACHINE_GNU_PLATFORM}/include
+@dirrm ${PKGNAME}/${MACHINE_GNU_PLATFORM}
 @dirrm ${PKGNAME}/bin
 @dirrm ${PKGNAME}
diff --git a/lang/gcc/PLIST.NetBSD-sparc b/lang/gcc/PLIST.NetBSD-sparc
index 74439023cec..c94275bd666 100644
--- a/lang/gcc/PLIST.NetBSD-sparc
+++ b/lang/gcc/PLIST.NetBSD-sparc
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.NetBSD-sparc,v 1.1 2001/11/01 00:32:24 zuntum Exp $
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtbegin.o
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtbeginS.o
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtend.o
-${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtendS.o
+@comment $NetBSD: PLIST.NetBSD-sparc,v 1.2 2002/03/14 16:21:57 wiz Exp $
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtbegin.o
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtbeginS.o
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtend.o
+${PKGNAME}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtendS.o
diff --git a/lang/gcc/PLIST.SunOS b/lang/gcc/PLIST.SunOS
index 4e21a896aa9..3fa50da5419 100644
--- a/lang/gcc/PLIST.SunOS
+++ b/lang/gcc/PLIST.SunOS
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST.SunOS,v 1.2 2002/01/09 16:33:33 seb Exp $
-${MACHINE_GCC_PLATFORM}/include/_G_config.h
-${MACHINE_GCC_PLATFORM}/include/assert.h
-bin/${MACHINE_GCC_PLATFORM}-gcc
+@comment $NetBSD: PLIST.SunOS,v 1.3 2002/03/14 16:21:57 wiz Exp $
+${MACHINE_GNU_PLATFORM}/include/_G_config.h
+${MACHINE_GNU_PLATFORM}/include/assert.h
+bin/${MACHINE_GNU_PLATFORM}-gcc
 bin/c++
 bin/c++filt
 bin/chill
@@ -221,78 +221,78 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1chill
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1obj
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1plus
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/chillrt0.o
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/collect2
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cpp0
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crt1.o
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtbegin.o
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtend.o
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crti.o
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtn.o
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/f771
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/gcrt1.o
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/gmon.o
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/README
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/assert.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/curses.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/exception
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/g2c.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/iso646.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/limits.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/math.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/new
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/new.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/NXConstStr.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/Object.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/Protocol.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/encoding.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/hash.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/objc-api.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/objc-list.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/objc.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/sarray.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/thr.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/typedstream.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/proto.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/stdarg.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/stdbool.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/stddef.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/sys/stream.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/syslimits.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/typeinfo
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-alpha.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-arc.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-c4x.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-clipper.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-h8300.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-i860.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-i960.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-m32r.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-m88k.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-mips.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-mn10200.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-mn10300.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-pa.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-ppc.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-pyr.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-sh.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-sparc.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-spur.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-v850.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/varargs.h
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/jc1
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/jvgenmain
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libchill.a
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libg2c.a
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libgcc.a
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libobjc.a
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libstdc++.a
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libstdc++.so
-lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/specs
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1chill
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1obj
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cc1plus
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/chillrt0.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/collect2
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/cpp0
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crt1.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtbegin.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtend.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crti.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/crtn.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/f771
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/gcrt1.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/gmon.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/README
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/assert.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/curses.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/exception
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/g2c.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/iso646.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/limits.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/math.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/new
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/new.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/NXConstStr.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/Object.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/Protocol.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/encoding.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/hash.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/objc-api.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/objc-list.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/objc.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/sarray.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/thr.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc/typedstream.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/proto.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/stdarg.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/stdbool.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/stddef.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/sys/stream.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/syslimits.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/typeinfo
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-alpha.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-arc.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-c4x.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-clipper.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-h8300.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-i860.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-i960.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-m32r.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-m88k.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-mips.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-mn10200.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-mn10300.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-pa.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-ppc.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-pyr.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-sh.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-sparc.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-spur.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/va-v850.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/varargs.h
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/jc1
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/jvgenmain
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libchill.a
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libg2c.a
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libgcc.a
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libobjc.a
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.a
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.so
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/specs
 lib/libiberty.a
 lib/libstdc++.a.2.10.0nb1
 lib/libstdc++.so.2.10.0nb1
@@ -300,13 +300,13 @@ man/man1/cccp.1
 man/man1/g++.1
 man/man1/g77.1
 man/man1/gcc.1
-@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/sys
-@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc
-@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include
-@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}
-@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}
+@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/sys
+@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc
+@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include
+@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}
+@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}
 @dirrm lib/gcc-lib
 @dirrm include/g++-3/std
 @dirrm include/g++-3
-@dirrm ${MACHINE_GCC_PLATFORM}/include
-@dirrm ${MACHINE_GCC_PLATFORM}
+@dirrm ${MACHINE_GNU_PLATFORM}/include
+@dirrm ${MACHINE_GNU_PLATFORM}