From 3d0911b16019865b66bd0db4ae4768f4d13d0909 Mon Sep 17 00:00:00 2001
From: seb <seb>
Date: Mon, 18 Feb 2002 15:14:00 +0000
Subject: Introduce new framework for handling info files generation and
 installation.

Summary of changes:
- removal of USE_GTEXINFO
- addition of mk/texinfo.mk
- inclusion of this file in package Makefiles requiring it
- `install-info' substituted by `${INSTALL_INFO}' in PLISTs
- tuning of mk/bsd.pkg.mk:
    removal of USE_GTEXINFO
    INSTALL_INFO added to PLIST_SUBST
    `${INSTALL_INFO}' replace `install-info' in target rules
    print-PLIST target now generate `${INSTALL_INFO}' instead of `install-info'
- a couple of new patch files added for a handful of packages
- setting of the TEXINFO_OVERRIDE "switch" in packages Makefiles requiring it
- devel/cssc marked requiring texinfo 4.0
- a couple of packages Makefiles were tuned with respect of INFO_FILES and
  makeinfo command usage

See -newly added by this commit- section 10.24 of Packages.txt for
further information.
---
 lang/gcc/Makefile |  3 ++-
 lang/gcc/PLIST    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'lang/gcc')

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 4c803d220fc..2a50b6b3f6d 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/02/16 14:46:20 kent Exp $
+# $NetBSD: Makefile,v 1.35 2002/02/18 15:14:25 seb Exp $
 
 # Make sure that the version number in "Makefile.gcc" matches this.
 DISTNAME=		gcc-2.95.3
@@ -97,6 +97,7 @@ post-install:
 	-${RMDIR} ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/v7
 .endif
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # Make bootstrap with compiler != gcc possible.
diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST
index 40bea101474..5c4c14890c1 100644
--- a/lang/gcc/PLIST
+++ b/lang/gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/03 21:32:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:25 seb Exp $
 etc/gcc-2.95.3.mk
 ${PKGNAME}/bin/c++
 ${PKGNAME}/bin/c++filt
@@ -207,17 +207,17 @@ ${PKGNAME}/man/man1/cccp.1
 ${PKGNAME}/man/man1/g++.1
 ${PKGNAME}/man/man1/g77.1
 ${PKGNAME}/man/man1/gcc.1
-@unexec install-info --delete %D/info/chill.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/chill.info %D/info/dir
 info/chill.info
-@unexec install-info --delete %D/info/cpp.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir
 info/cpp.info
-@exec install-info %D/info/cpp.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir
 info/cpp.info-1
 info/cpp.info-2
 info/cpp.info-3
-@unexec install-info --delete %D/info/g77.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/g77.info %D/info/dir
 info/g77.info
-@exec install-info %D/info/g77.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/g77.info %D/info/dir
 info/g77.info-1
 info/g77.info-10
 info/g77.info-11
@@ -239,9 +239,9 @@ info/g77.info-6
 info/g77.info-7
 info/g77.info-8
 info/g77.info-9
-@unexec install-info --delete %D/info/gcc.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir
 info/gcc.info
-@exec install-info %D/info/gcc.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir
 info/gcc.info-1
 info/gcc.info-10
 info/gcc.info-11
-- 
cgit v1.2.3