From ba56a6d962bf14bb906ae2ad6fbe36b11088e35f Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 20 Mar 2006 18:15:37 +0000
Subject: * 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.
---
 lang/gcc-ssp/Makefile | 9 +++++----
 lang/gcc-ssp/PLIST    | 7 ++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'lang/gcc-ssp')

diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 8e8473a6049..49edf923b4c 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGNAME=		gcc-ssp-2.95.3.13
@@ -43,11 +43,12 @@ MAKE_ENV+=		ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
 CONFIGURE_DIRS=		${WRKDIR}/objdir
 BUILD_DIRS=		${CONFIGURE_DIRS}
 
-FILES_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV:Q} GCC_PREFIX=${GCC_PREFIX:Q}
+FILES_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV:Q}		\
+			GCC_PREFIX=${GCC_PREFIX:Q}
+PLIST_SUBST+=		GCC_PREFIX=${GCC_PREFIX:S|^${PREFIX}/||:Q}
 MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV}
 
-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-ssp/PLIST b/lang/gcc-ssp/PLIST
index bdfed7871f6..32c8e9c3f5e 100644
--- a/lang/gcc-ssp/PLIST
+++ b/lang/gcc-ssp/PLIST
@@ -1,3 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2003/08/09 12:43:02 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 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/${PKGNAME}/mk.conf
 @dirrm share/examples/${PKGNAME}
+@dirrm share/examples/${PKGNAME}
-- 
cgit v1.2.3