* 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, 14 insertions, 12 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index fd4ffb0759d..d09990533cf 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/03/09 18:48:29 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
@@ -45,8 +45,7 @@ CONFIGURE_ARGS+=	--disable-shared
 GNU_PLATFORM_DIR!=	${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM}
 PLIST_SUBST+=		GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q}
 
-INFO_FILES=	octave.info liboctave.info
-LIBOCTAVE_INFO=	liboctave.info liboctave.info-[0-9]*
+INFO_FILES=	# PLIST
 OCTAVE_DOC=	faq/Octave-FAQ.ps interpreter/octave.ps \
 		liboctave/liboctave.ps refcard/refcard-a4.ps \
 		refcard/refcard-legal.ps  refcard/refcard-letter.ps
@@ -74,9 +73,9 @@ post-build:
 
 post-install:
 	cd ${WRKSRC}/doc/liboctave;					\
-	for f in ${LIBOCTAVE_INFO}; do					\
+	for f in liboctave.info liboctave.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
-			${INSTALL_DATA} "$$f" ${PREFIX}/${INFO_DIR};	\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .for f in ${OCTAVE_DOC}
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 18a3a88d8fa..5c67eff65f5 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2006/01/06 22:41:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2006/03/20 18:15:38 jlam Exp $
 bin/mkoctfile-${PKGVERSION}
 bin/mkoctfile
 bin/octave
@@ -593,6 +593,8 @@ include/octave-${PKGVERSION}/octave/vx-s-crv.h
 include/octave-${PKGVERSION}/octave/xdiv.h
 include/octave-${PKGVERSION}/octave/xpow.h
 include/octave-${PKGVERSION}/octave/zfstream.h
+info/liboctave.info
+info/octave.info
 lib/libcruft.la
 lib/liboctave.la
 lib/liboctinterp.la
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 07ada8df0fb..59ba87b4233 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2006/03/09 15:43:46 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGREVISION=	1
@@ -42,8 +42,7 @@ CONFIGURE_ARGS+=	--enable-dl
 GNU_PLATFORM_DIR!=	${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM}
 PLIST_SUBST+=	GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q}
 
-INFO_FILES=	octave.info liboctave.info
-LIBOCTAVE_INFO=	liboctave.info liboctave.info-[0-9]*
+INFO_FILES=	# PLIST
 OCTAVE_DOC=	faq/Octave-FAQ.ps interpreter/octave.ps \
 		liboctave/liboctave.ps refcard/refcard-a4.ps \
 		refcard/refcard-legal.ps  refcard/refcard-letter.ps
@@ -73,9 +72,9 @@ post-build:
 
 post-install:
 	cd ${WRKSRC}/doc/liboctave;					\
-	for f in ${LIBOCTAVE_INFO}; do					\
+	for f in liboctave.info liboctave.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
-			${INSTALL_DATA} "$$f" ${PREFIX}/${INFO_DIR};	\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .for f in ${OCTAVE_DOC}
diff --git a/math/octave/PLIST b/math/octave/PLIST
index 936351b0405..c0faf168dc1 100644
--- a/math/octave/PLIST
+++ b/math/octave/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/11/29 13:11:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/20 18:15:38 jlam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -550,6 +550,8 @@ include/octave-${PKGVERSION}/octave/vx-s-ccv.h
 include/octave-${PKGVERSION}/octave/vx-s-crv.h
 include/octave-${PKGVERSION}/octave/xdiv.h
 include/octave-${PKGVERSION}/octave/xpow.h
+info/liboctave.info
+info/octave.info
 lib/libcruft.la
 lib/liboctave.la
 lib/liboctinterp.la