diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-20 01:48:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-20 01:48:57 +0000 |
| commit | 4a974e6f6ef66acae1af6e5b645e8cc36e48cc39 (patch) | |
| tree | ae13569d46a666109d6041531b50702a8539f819 /mk/defaults | |
| parent | 099c89e3556f83d8a2dadfa46faa57b28eb7789e (diff) | |
| download | pkgsrc-4a974e6f6ef66acae1af6e5b645e8cc36e48cc39.tar.gz | |
* 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.
Diffstat (limited to 'mk/defaults')
| -rw-r--r-- | mk/defaults/mk.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 24d051a5211..80f1d003919 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.112 2006/03/09 20:44:45 tonio Exp $ +# $NetBSD: mk.conf,v 1.113 2006/03/20 01:48:58 jlam Exp $ # # This file provides default values for variables that may be overridden @@ -207,11 +207,14 @@ VARBASE?= /var # Default: ${X11PREFIX} or where openmotif or lesstif is installed INFO_DIR?= info +PKGINFODIR?= ${INFO_DIR} # Pathname relative to ${PREFIX} of directory holding the # info files and the info "dir" (index) file. # Possible: any path you like, e.g. share/info. # Default: info (i.e. /usr/pkg/info) # NOTE: the support for custom setting (not "info") is not complete. +# +# XXX INFO_DIR is obsolete and should be removed after pkgsrc-2006Q1. PKGMANDIR?= man # Pathname relative to ${PREFIX} of directory holding the |