From 1c035e359984777e5eee2d0a0feac83947966ff2 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 5 Apr 2006 06:27:41 +0000
Subject: List the info files directly in the PLIST, and honor PKGINFODIR and
 PKGMANDIR.

---
 lang/sather/Makefile | 21 ++++++++++++---------
 lang/sather/PLIST    |  5 ++++-
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'lang/sather')

diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index bc6507da1b2..6580baf9e12 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/05 16:27:26 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/05 06:27:42 jlam Exp $
 
 DISTNAME=		sather-1.2.1
 PKGREVISION=		6
@@ -12,8 +12,7 @@ COMMENT=		Compiler for the Sather object oriented programming language
 USE_TOOLS+=		gmake makeinfo
 
 BUILD_TARGET=		full optional
-
-INFO_FILES=		sather.info sather-tutorial.info sather-mode.info
+INFO_FILES=		# PLIST
 
 REPLACE_PERL=		Browser/Web/ps2gif
 
@@ -53,9 +52,10 @@ post-patch:
 	cd ${WRKSRC}/System/Platforms && ${CP} -r netbsd dragonfly
 
 post-build:
-	cd ${WRKSRC}/Emacs; ${MAKEINFO} sather.texinfo; 		\
-		${MAKEINFO} sather-tutorial.texinfo; 			\
-		${MAKEINFO} sather-mode.texinfo
+	cd ${WRKSRC}/Emacs;						\
+		makeinfo sather.texinfo; 				\
+		makeinfo sather-tutorial.texinfo; 			\
+		makeinfo sather-mode.texinfo
 	${RM} -fr ${WRKSRC}/System/Platforms/dualgui/dual_gui_server.code
 
 do-install:
@@ -82,12 +82,15 @@ do-install:
 		${PREFIX}/lib/sather/System
 	${FIND} ${PREFIX}/lib/sather -name \*.config -o -name Makefile 	\
 		-o -name \*.orig -print | ${XARGS} ${RM} -f
-	${INSTALL_DATA} ${WRKSRC}/Emacs/*.info* ${PREFIX}/info
+	cd ${WRKSRC}/Emacs; for f in *.info *.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sather
 	cd ${WRKSRC}/Doc && ${PAX} -rw -s ',.*/man.*,,' .		\
 		${PREFIX}/share/doc/sather
-	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sabrowse.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sabrowse.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Emacs/*.el ${PREFIX}/share/emacs/site-lisp
 
diff --git a/lang/sather/PLIST b/lang/sather/PLIST
index 8d91ad6088d..c1a0a6db8e0 100644
--- a/lang/sather/PLIST
+++ b/lang/sather/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/07 09:29:04 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/05 06:27:42 jlam Exp $
 bin/sabrowse
 bin/sacomp
+info/sather-mode.info
+info/sather-tutorial.info
+info/sather.info
 lib/sather/Bin/PP
 lib/sather/Bin/bin-wrapper
 lib/sather/Bin/gen_html
-- 
cgit v1.2.3