From 26e00a350f8be431df176aaf444c5ecbfaa5526d Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 20 Mar 2006 05:35:58 +0000
Subject: Replace INFO_DIR with EMACS_INFOPREFIX, which is the correct location
 for info files for both emacs and xemacs.  Handle the split info file case
 correctly when installing the info files.

---
 misc/bbdb/Makefile | 21 ++++++++-------------
 misc/bbdb/PLIST    |  8 ++------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile
index 0c3d4a6f864..caf14f79abf 100644
--- a/misc/bbdb/Makefile
+++ b/misc/bbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/05 16:27:27 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/20 05:35:58 jlam Exp $
 #
 
 DISTNAME=		bbdb-2.34
@@ -19,9 +19,9 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 BUILD_TARGET=		all mhe
 USE_TOOLS+=		makeinfo
-INFO_FILES=		bbdb.info
-INFO_DIR=		${INFODIR}
-PLIST_SUBST+=		INFODIR=${INFODIR:Q}
+INFO_FILES=		# PLIST
+LISPDIR=		${EMACS_LISPPREFIX}/bbdb
+INSTALLATION_DIRS=	${EMACS_INFOPREFIX}
 
 .include "../../mk/emacs.mk"
 
@@ -29,20 +29,15 @@ PLIST_SUBST+=		INFODIR=${INFODIR:Q}
 CONFIGURE_ARGS+=	--with-emacs=xemacs
 CONFIGURE_ARGS+=	--with-package-dir=${PREFIX}/lib/xemacs/site-packages
 INSTALL_TARGET=		install-pkg
-INFODIR=		lib/xemacs/site-packages/info
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${INFODIR}
 .else
-LISPDIR=	${EMACS_LISPPREFIX}/bbdb
-INFODIR=	info
-
-INSTALLATION_DIRS=	${INFO_DIR}
-
 do-install:
 	${MKDIR} ${LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.elc ${LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/texinfo/bbdb.info* ${PREFIX}/${INFO_DIR}
+	cd ${WRKSRC}; for f in bbdb.info bbdb.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/bbdb/PLIST b/misc/bbdb/PLIST
index 2533ffef04d..5c419e9b90e 100644
--- a/misc/bbdb/PLIST
+++ b/misc/bbdb/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/04 13:45:53 minoura Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/20 05:35:58 jlam Exp $
+${EMACS_INFOPREFIX}/bbdb.info
 ${FOR_emacs20}${EMACS_LISPPREFIX}/bbdb/bbdb-autoloads.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/bbdb/bbdb-autoloads.el
 ${EMACS_LISPPREFIX}/bbdb/bbdb-com.el
@@ -42,8 +43,3 @@ ${EMACS_LISPPREFIX}/bbdb/bbdb-xemacs.elc
 ${EMACS_LISPPREFIX}/bbdb/bbdb.el
 ${EMACS_LISPPREFIX}/bbdb/bbdb.elc
 @dirrm ${EMACS_LISPPREFIX}/bbdb
-${INFODIR}/bbdb.info
-${INFODIR}/bbdb.info-1
-${INFODIR}/bbdb.info-2
-${INFODIR}/bbdb.info-3
-${INFODIR}/bbdb.info-4
-- 
cgit v1.2.3