diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-20 18:15:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-20 18:15:37 +0000 |
| commit | 741aecb60794fe08a7a2c61bfcc516bee56c6a2b (patch) | |
| tree | 0f05903ff61fcd859ec72aa544fa1e5eda653bf6 /lang/gcc | |
| parent | 6132a5c7603ce3eb9c6eaaf83c45b47f9e30fa6d (diff) | |
| download | pkgsrc-741aecb60794fe08a7a2c61bfcc516bee56c6a2b.tar.gz | |
* Nuke all references to and definitions of INFO_DIR in package Makefiles
and replace with appropriate references to PKGINFODIR instead.
* Properly account for split info files during installation.
* Move info file listings directly into the package PLISTs.
This fixes info-file-related PLIST problems.
Diffstat (limited to 'lang/gcc')
| -rw-r--r-- | lang/gcc/Makefile | 11 | ||||
| -rw-r--r-- | lang/gcc/PLIST | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index cf2cd433ad7..17d4adb1e48 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2006/03/04 21:29:54 jlam Exp $ +# $NetBSD: Makefile,v 1.88 2006/03/20 18:15:38 jlam Exp $ DISTNAME= gcc-2.95.3 PKGREVISION= 7 @@ -32,12 +32,13 @@ MAKE_ENV+= ac_cv_prog_chmod=${TOOLS_CHMOD:Q} CONFIGURE_DIRS= ${WRKDIR}/objdir BUILD_DIRS= ${CONFIGURE_DIRS} -FILES_SUBST+= DISTNAME=${DISTNAME:Q} GCC_PREFIX=${GCC_PREFIX:Q} +FILES_SUBST+= DISTNAME=${DISTNAME:Q} \ + GCC_PREFIX=${GCC_PREFIX:Q} MESSAGE_SUBST+= DISTNAME=${DISTNAME} -PLIST_SUBST+= DISTNAME=${DISTNAME:Q} +PLIST_SUBST+= DISTNAME=${DISTNAME:Q} \ + GCC_PREFIX=${GCC_PREFIX:S|^${PREFIX}/||:Q} -INFO_DIR= ${GCC_PREFIX:S|^${PREFIX}/||}/info -INFO_FILES= chill.info cpp.info g77.info gcc.info +INFO_FILES= # PLIST .include "../../mk/bsd.prefs.mk" diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST index a2b60e6a9da..1304fe5b846 100644 --- a/lang/gcc/PLIST +++ b/lang/gcc/PLIST @@ -1,3 +1,7 @@ -@comment $NetBSD: PLIST,v 1.12 2003/07/13 13:16:03 grant Exp $ +@comment $NetBSD: PLIST,v 1.13 2006/03/20 18:15:38 jlam Exp $ +${GCC_PREFIX}/info/chill.info +${GCC_PREFIX}/info/cpp.info +${GCC_PREFIX}/info/g77.info +${GCC_PREFIX}/info/gcc.info share/examples/${DISTNAME}/mk.conf @dirrm share/examples/${DISTNAME} |