* 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.

4 files changed, 19 insertions, 11 deletions

diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile
index 9f28f868e25..13fc91b546e 100644
--- a/cross/h8300-hms-binutils/Makefile
+++ b/cross/h8300-hms-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/05 16:27:23 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/20 18:15:37 jlam Exp $
 
 DISTNAME=		binutils-2.12.1
 PKGNAME=		cross-h8300-hms-binutils-2.12.1
@@ -23,15 +23,13 @@ CONFIGURE_SCRIPT=	${SRCDIR}/configure
 SRCDIR=			${WRKDIR}/${DISTNAME}
 BUILD_TARGET=		CFLAGS="-O2 -fomit-frame-pointer" all
 INFO_DIR=		libexec/cross-h8300-hms/binutils
-INFO_FILES=		as.info bfd.info binutils.info configure.info
-INFO_FILES+=		gasp.info ld.info standards.info
+INFO_FILES=		# PLIST
+
+INSTALLATION_DIRS=	${H8300_PREFIX}
 
 post-extract:
 	${MKDIR} ${WRKSRC}
 
-pre-install:
-	${MKDIR} ${H8300_PREFIX}
-
 post-install:
 	for f in h8300-hms-size      h8300-hms-objdump h8300-hms-ar \
 		 h8300-hms-strings   h8300-hms-ranlib  h8300-hms-objcopy \
diff --git a/cross/h8300-hms-binutils/PLIST b/cross/h8300-hms-binutils/PLIST
index d4113847dd7..29120ae634b 100644
--- a/cross/h8300-hms-binutils/PLIST
+++ b/cross/h8300-hms-binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/20 18:15:37 jlam Exp $
 bin/h8300-hms-addr2line
 bin/h8300-hms-ar
 bin/h8300-hms-as
@@ -16,6 +16,13 @@ bin/h8300-hms-srconv
 bin/h8300-hms-strings
 bin/h8300-hms-strip
 bin/h8300-hms-sysdump
+libexec/cross-h8300-hms/binutils/as.info
+libexec/cross-h8300-hms/binutils/bfd.info
+libexec/cross-h8300-hms/binutils/binutils.info
+libexec/cross-h8300-hms/binutils/configure.info
+libexec/cross-h8300-hms/binutils/gasp.info
+libexec/cross-h8300-hms/binutils/ld.info
+libexec/cross-h8300-hms/binutils/standards.info
 libexec/cross-h8300-hms/bin/h8300-hms-addr2line
 libexec/cross-h8300-hms/bin/h8300-hms-ar
 libexec/cross-h8300-hms/bin/h8300-hms-as
diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile
index 9eccc9a8603..5e0d489df49 100644
--- a/cross/h8300-hms-gcc/Makefile
+++ b/cross/h8300-hms-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/20 18:15:37 jlam Exp $
 
 DISTNAME=		gcc-core-3.1
 PKGNAME=		cross-h8300-hms-gcc-3.1
@@ -31,8 +31,7 @@ CONFIGURE_ARGS+=	--with-newlib
 CONFIGURE_SCRIPT=	${SRCDIR}/configure
 SRCDIR=			${WRKDIR}/gcc-3.1
 BUILD_TARGET=		CFLAGS="-O2 -fomit-frame-pointer" all
-INFO_DIR=		${H8300_PREFIX:S|${PREFIX}/||}/gcc
-INFO_FILES=             cpp.info cppinternals.info gcc.info gccint.info
+INFO_FILES=             # PLIST
 
 GCC_REQD+=		2.8.0
 
diff --git a/cross/h8300-hms-gcc/PLIST b/cross/h8300-hms-gcc/PLIST
index 1457953f8f5..294a8df89b8 100644
--- a/cross/h8300-hms-gcc/PLIST
+++ b/cross/h8300-hms-gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/13 17:48:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/20 18:15:37 jlam Exp $
 bin/h8300-hms-cpp
 bin/h8300-hms-gcc
 bin/h8300-hms-gccbug
@@ -7,6 +7,10 @@ libexec/cross-h8300-hms/bin/h8300-hms-cpp
 libexec/cross-h8300-hms/bin/h8300-hms-gcc
 libexec/cross-h8300-hms/bin/h8300-hms-gccbug
 libexec/cross-h8300-hms/bin/h8300-hms-gcov
+libexec/cross-h8300-hms/gcc/cpp.info
+libexec/cross-h8300-hms/gcc/cppinternals.info
+libexec/cross-h8300-hms/gcc/gcc.info
+libexec/cross-h8300-hms/gcc/gccint.info
 libexec/cross-h8300-hms/h8300-hms/bin/gcc
 libexec/cross-h8300-hms/h8300-hms/include/_ansi.h
 libexec/cross-h8300-hms/h8300-hms/include/_syslist.h