diff options
author | seb <seb> | 2003-07-04 16:11:55 +0000 |
---|---|---|
committer | seb <seb> | 2003-07-04 16:11:55 +0000 |
commit | e4ace7569a2f05ff6ea22b14073b1f6b11da93fc (patch) | |
tree | 81b85379a3aece3f28940140931e89e84d532797 /lang/gcc3 | |
parent | e53c49ae3ae15dc1981e770c46c64bc0c5869256 (diff) | |
download | pkgsrc-e4ace7569a2f05ff6ea22b14073b1f6b11da93fc.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/gcc3')
-rw-r--r-- | lang/gcc3/MESSAGE | 7 | ||||
-rw-r--r-- | lang/gcc3/Makefile | 12 | ||||
-rw-r--r-- | lang/gcc3/PLIST | 6 | ||||
-rw-r--r-- | lang/gcc3/files/gcc3.mk | 4 |
4 files changed, 15 insertions, 14 deletions
diff --git a/lang/gcc3/MESSAGE b/lang/gcc3/MESSAGE index 912679b448f..3ec6da7a8cd 100644 --- a/lang/gcc3/MESSAGE +++ b/lang/gcc3/MESSAGE @@ -1,7 +1,8 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2003/05/02 13:36:51 jmmv Exp $ +$NetBSD: MESSAGE,v 1.4 2003/07/04 16:11:57 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/gcc3/Makefile b/lang/gcc3/Makefile index 680f5e9b4b8..d8130ae28dc 100644 --- a/lang/gcc3/Makefile +++ b/lang/gcc3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2003/07/03 18:19:18 drochner Exp $ +# $NetBSD: Makefile,v 1.31 2003/07/04 16:11:57 seb Exp $ # DISTNAME= gcc-3.3 @@ -26,9 +26,9 @@ CONFIGURE_ARGS+= --infodir=${PREFIX}/info CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} UNLIMIT_RESOURCES= datasize -# as this is named gcc3, use DISTNAME instead. -FILES_SUBST+= PKGNAME_NOREV=${DISTNAME} GCC_PREFIX=${GCC_PREFIX} -MESSAGE_SUBST+= PKGNAME_NOREV=${DISTNAME} +FILES_SUBST+= DISTNAME=${DISTNAME} GCC_PREFIX=${GCC_PREFIX} +MESSAGE_SUBST+= DISTNAME=${DISTNAME} +PLIST_SUBST+= DISTNAME=${DISTNAME} TEXINFO_REQD= 4.2 @@ -97,8 +97,8 @@ post-install: .if ${OPSYS} == "SunOS" -cd ${GCC_ARCHDIR}/include && ${RM} -f fixed && ${RMDIR} v7 v9 .endif - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gcc - ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${PREFIX}/share/examples/gcc/mk.conf + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${DISTNAME} + ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${PREFIX}/share/examples/${DISTNAME}/mk.conf ${LN} -f ${GCC_PREFIX}/bin/gcc ${GCC_PREFIX}/bin/cc # ${LN} -f ${GCC_PREFIX}/bin/g77 ${GCC_PREFIX}/bin/f77 ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} diff --git a/lang/gcc3/PLIST b/lang/gcc3/PLIST index 4afeceb7a85..10cac3e6f58 100644 --- a/lang/gcc3/PLIST +++ b/lang/gcc3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2003/07/03 15:56:37 drochner Exp $ +@comment $NetBSD: PLIST,v 1.7 2003/07/04 16:11:57 seb Exp $ @unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir info/cpp.info @exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir @@ -14,5 +14,5 @@ info/gccint.info @unexec ${INSTALL_INFO} --delete %D/info/cppinternals.info %D/info/dir info/cppinternals.info @exec ${INSTALL_INFO} %D/info/cppinternals.info %D/info/dir -share/examples/gcc/mk.conf -@dirrm share/examples/gcc +share/examples/${DISTNAME}/mk.conf +@dirrm share/examples/${DISTNAME} diff --git a/lang/gcc3/files/gcc3.mk b/lang/gcc3/files/gcc3.mk index f863b284969..d55ae8b3ede 100644 --- a/lang/gcc3/files/gcc3.mk +++ b/lang/gcc3/files/gcc3.mk @@ -1,6 +1,6 @@ -# $NetBSD: gcc3.mk,v 1.6 2003/07/03 15:56:38 drochner Exp $ +# $NetBSD: gcc3.mk,v 1.7 2003/07/04 16:11:58 seb Exp $ # -# make configuration file for @PKGNAME_NOREV@ +# make configuration file for @DISTNAME@ USE_GCC3= # defined CC= @GCC_PREFIX@/bin/cc |