3 files changed, 7 insertions, 6 deletions
diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile
index 0374f1dc186..04da6892339 100644
--- a/devel/libg++/Makefile
+++ b/devel/libg++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/05/17 08:38:44 abs Exp $
+# $NetBSD: Makefile,v 1.20 2002/02/18 15:14:13 seb Exp $
 #
 
 DISTNAME=	libg++-${GXXVERSION}
@@ -33,4 +33,5 @@ post-install:
 		/bin/ls 2>/dev/null -1d lib/libg++*.a lib/libg++.so*) \
 		>${PLIST_SRC}
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libg++/PLIST.pre b/devel/libg++/PLIST.pre
index b7f62525458..42d394e2060 100644
--- a/devel/libg++/PLIST.pre
+++ b/devel/libg++/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 01:30:52 zuntum Exp $
+@comment $NetBSD: PLIST.pre,v 1.2 2002/02/18 15:14:13 seb Exp $
 bin/genclass
 include/g++/gen/AVLMap.hP
 include/g++/gen/AVLSet.hP
@@ -172,6 +172,6 @@ include/g++/sysent.h
 include/g++/typemacros.h
 @dirrm include/g++/gen
 @dirrm include/g++
-@unexec install-info --delete %D/info/libg++.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/libg++.info %D/info/dir
 info/libg++.info
-@exec install-info %D/info/libg++.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/libg++.info %D/info/dir
diff --git a/devel/libg++/files/Makefile b/devel/libg++/files/Makefile
index fc79af3c93c..4132607a156 100644
--- a/devel/libg++/files/Makefile
+++ b/devel/libg++/files/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 1998/05/18 14:05:44 tv Exp $
+#	$NetBSD: Makefile,v 1.3 2002/02/18 15:14:13 seb Exp $
 # Makefile for libg++ add-on for NetBSD.  Requires libstdc++ shlib v1.x.
 
 LIB=g++
@@ -67,7 +67,7 @@ genclass: libg++/genclass/genclass.sh
 	sed -e "s,<VERSION>,${GXXVERSION},;s,^PROTODIR.*,PROTODIR=${PREFIX}/include/g++/gen," ${.ALLSRC} >${.TARGET}
 
 libg++.info: libg++/libg++.texi
-	makeinfo --no-split -I libg++/texinfo -o libg++.info libg++/libg++.texi
+	${MAKEINFO} --no-split -I libg++/texinfo -o libg++.info libg++/libg++.texi
 
 .PATH: libg++/src librx