summaryrefslogtreecommitdiff
path: root/lang/gcc
diff options
context:
space:
mode:
authorseb <seb>2003-07-04 16:11:55 +0000
committerseb <seb>2003-07-04 16:11:55 +0000
commitb128988d327ad1cea902efb724d5721f5492b286 (patch)
tree81b85379a3aece3f28940140931e89e84d532797 /lang/gcc
parent78ac805f8792fa6cbe52a15c9012990faadf1a01 (diff)
downloadpkgsrc-b128988d327ad1cea902efb724d5721f5492b286.tar.gz
Install example mk.conf in package specific directory.
Adjust and make uniform various substitution variables and MESSAGE files. No PKGREVISION bump right now.
Diffstat (limited to 'lang/gcc')
-rw-r--r--lang/gcc/MESSAGE7
-rw-r--r--lang/gcc/Makefile14
-rw-r--r--lang/gcc/PLIST6
-rw-r--r--lang/gcc/files/gcc.mk4
4 files changed, 17 insertions, 14 deletions
diff --git a/lang/gcc/MESSAGE b/lang/gcc/MESSAGE
index b13cf8d94e8..1277c44f4f2 100644
--- a/lang/gcc/MESSAGE
+++ b/lang/gcc/MESSAGE
@@ -1,7 +1,8 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/05/02 08:22:12 jmmv Exp $
+$NetBSD: MESSAGE,v 1.5 2003/07/04 16:11:55 seb Exp $
-To use ${PKGNAME} include "${PREFIX}/share/examples/gcc/mk.conf" in your
-BSD style makefile.
+To use ${PKGNAME} include
+"${PREFIX}/share/examples/${DISTNAME}/mk.conf"
+in your BSD style makefile.
===========================================================================
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 23dc4d220e3..29f951b17b2 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2003/06/02 01:19:04 jschauma Exp $
+# $NetBSD: Makefile,v 1.61 2003/07/04 16:11:55 seb Exp $
DISTNAME= gcc-2.95.3
PKGREVISION= 2
@@ -26,7 +26,6 @@ CONFIGURE_ARGS= --host=${MACHINE_GNU_PLATFORM}
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX}
CONFIGURE_ARGS+= --enable-shared
-PLIST_SUBST+= GCC_VERSION=${PKGVERSION}
CONFIGURE_DIRS= ${WRKDIR}/objdir
BUILD_DIRS= ${CONFIGURE_DIRS}
@@ -57,6 +56,9 @@ ALL_TARGET= bootstrap
GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}
FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX}
+FILES_SUBST+= DISTNAME=${DISTNAME}
+MESSAGE_SUBST+= DISTNAME=${DISTNAME}
+PLIST_SUBST+= DISTNAME=${DISTNAME}
post-extract:
${MKDIR} ${WRKSRC}
@@ -87,13 +89,13 @@ post-build:
# make install; make deinstall; make install
#
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gcc
- ${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/share/examples/gcc/mk.conf
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${DISTNAME}
+ ${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/share/examples/${DISTNAME}/mk.conf
-cd ${GCC_ARCHDIR}/include && ${RM} -f fixed && ${RMDIR} v7 v9
.else
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gcc
- ${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/share/examples/gcc/mk.conf
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${DISTNAME}
+ ${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/share/examples/${DISTNAME}/mk.conf
. if exists(/usr/include/g++/FlexLexer.h)
${LN} -fs /usr/include/g++/FlexLexer.h \
${GCC_PREFIX}/include/g++-3/FlexLexer.h
diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST
index e10177a07b3..32d35c80583 100644
--- a/lang/gcc/PLIST
+++ b/lang/gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/05/02 08:22:12 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/07/04 16:11:56 seb Exp $
@unexec ${INSTALL_INFO} --delete %D/info/chill.info %D/info/dir
info/chill.info
@exec ${INSTALL_INFO} %D/info/chill.info %D/info/dir
@@ -65,5 +65,5 @@ info/gcc.info-6
info/gcc.info-7
info/gcc.info-8
info/gcc.info-9
-share/examples/gcc/mk.conf
-@dirrm share/examples/gcc
+share/examples/${DISTNAME}/mk.conf
+@dirrm share/examples/${DISTNAME}
diff --git a/lang/gcc/files/gcc.mk b/lang/gcc/files/gcc.mk
index 84ae399902c..7a9a58fc384 100644
--- a/lang/gcc/files/gcc.mk
+++ b/lang/gcc/files/gcc.mk
@@ -1,6 +1,6 @@
-# $NetBSD: gcc.mk,v 1.4 2002/09/27 12:28:16 jlam Exp $
+# $NetBSD: gcc.mk,v 1.5 2003/07/04 16:11:56 seb Exp $
#
-# make configuration file for @PKGNAME@
+# make configuration file for @DISTNAME@
CC= @GCC_PREFIX@/bin/cc
CPP= @GCC_PREFIX@/bin/cpp