* Creates a new variable PKGINFODIR (named similarly to PKGMANDIR)

  that is a purely user-settable variable to represent the relative
  path under ${PREFIX} where info files are stored and "dir" files
  are managed.  PKGINFODIR defaults to "info".  INFO_DIR still works,
  but will be obsoleted after the 2006Q1 branch.

* Modify GNU_CONFIGURE_INFODIR to only honor ${PKGINFODIR} if the
  package installs directly into ${PREFIX} and not some subdirectory
  under ${PREFIX}.  This fixes packages that don't really honor
  $(infodir) all that well, and also avoids PLIST problems relating
  to directory removal for those packages.

* Since the majority of Emacs Lisp packages use GNU_CONFIGURE, just
  set GNU_CONFIGURE_INFODIR directly to ${EMACS_INFOPREFIX}, which is
  the Emacs-distro-specific location for info files.  Also pass
  EMACS_INFOPREFIX through PLIST_SUBST for PLIST substitution.

* INFO_FILES should be defined if the package installs info files.
  If the info files are not listed in the PLIST, then INFO_FILES
  must list the filenames for the info files installed by the package,
  which are assumed to be located in ${PREFIX}/${PKGINFODIR}.

* The plist module can now better detect info files listed in PLISTs
  and exports a command to the pkginstall module to append info file
  names to the +INFO_FILES scriptlet at install-time.

* The print-PLIST target is updated to properly list info files in
  the auto-generated PLIST.

* The check-files code is updated to skip all "dir" Info database files.

1 files changed, 10 insertions, 5 deletions

diff --git a/mk/emacs.mk b/mk/emacs.mk
index b0eac9b555b..3b6e6399759 100644
--- a/mk/emacs.mk
+++ b/mk/emacs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emacs.mk,v 1.24 2006/03/11 06:23:20 uebayasi Exp $
+# $NetBSD: emacs.mk,v 1.25 2006/03/20 01:48:58 jlam Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -99,7 +99,7 @@
 #			installed into.  Unlike EMACS_ETCPREFIX or
 #			EMACS_LISPPREFIX, subdirectory is not needed.
 #		Possible values:
-#			${PREFIX}/info
+#			${PREFIX}/${PKGINFODIR}
 #	  		${PREFIX}/lib/xemacs/site-packages/info
 #
 #	EMACS_LISPPREFIX
@@ -145,7 +145,7 @@
 #			Same as the one in Makefile, except that
 #			${PREFIX} is omitted in PLIST.
 #		Possible values:
-#			info
+#			${PKGINFODIR}
 #	  		lib/xemacs/site-packages/info
 #
 #	EMACS_LISPPREFIX
@@ -299,15 +299,18 @@ EMACS_VERSION_MAJOR=	${_EMACS_VERSION_MAJOR}
 EMACS_VERSION_MINOR=	${_EMACS_VERSION_MINOR}
 .if ${EMACS_FLAVOR} == "emacs"
 EMACS_ETCPREFIX=	${PREFIX}/share
-EMACS_INFOPREFIX=	${PREFIX}/info
+EMACS_INFOPREFIX=	${PREFIX}/${PKGINFODIR}
 EMACS_LISPPREFIX=	${PREFIX}/share/emacs/site-lisp
 EMACS_PKGNAME_PREFIX=
-.else
+.elif ${EMACS_FLAVOR} == "xemacs"
 EMACS_ETCPREFIX=	${PREFIX}/lib/xemacs/site-packages/etc
 EMACS_INFOPREFIX=	${PREFIX}/lib/xemacs/site-packages/info
 EMACS_LISPPREFIX=	${PREFIX}/lib/xemacs/site-packages/lisp
 EMACS_PKGNAME_PREFIX=	xemacs-
+.else
+PKG_FAIL_REASON+=	"\`\`${EMACS_FLAVOR}'' is not a valid EMACS_FLAVOR"
 .endif
+GNU_CONFIGURE_INFODIR?=	${EMACS_INFOPREFIX}
 
 _EMACS_FOR.emacs=		"@comment "
 _EMACS_FOR.emacs21=		"@comment "
@@ -328,7 +331,9 @@ _EMACS_FOR.${_EMACS_TYPE}=	""
 _EMACS_NOTFOR.${EMACS_FLAVOR}=	"@comment "
 _EMACS_NOTFOR.${_EMACS_TYPE}=	"@comment "
 
+PLIST_SUBST+=	EMACS_FLAVOR=${EMACS_FLAVOR:Q}
 PLIST_SUBST+=	EMACS_VERSION=${_EMACS_VERSION_NOREV:Q}
+PLIST_SUBST+=	EMACS_INFOPREFIX=${EMACS_INFOPREFIX:C|^${PREFIX}/||}
 PLIST_SUBST+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX:C|^${PREFIX}/||}
 PLIST_SUBST+=	FOR_emacs=${_EMACS_FOR.emacs}
 PLIST_SUBST+=	FOR_emacs21=${_EMACS_FOR.emacs21}