summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.use.mk
diff options
context:
space:
mode:
authorjlam <jlam>2006-03-05 16:27:22 +0000
committerjlam <jlam>2006-03-05 16:27:22 +0000
commitce4bbe5f06174694c3b499219adedc4dab48cc15 (patch)
treee3c6cf61f7cffff30eee10d4bef3729227d7edcb /mk/bsd.pkg.use.mk
parent8c289c620336c1910cc533433541050cac4530a4 (diff)
downloadpkgsrc-ce4bbe5f06174694c3b499219adedc4dab48cc15.tar.gz
* Teach the tools framework how to supply the pkgsrc version of
makeinfo if no native makeinfo executable exists. Honor TEXINFO_REQD when determining whether the native makeinfo can be used. * Remove USE_MAKEINFO and replace it with USE_TOOLS+=makeinfo. * Get rid of all the "split" argument deduction for makeinfo since the PLIST module already handles varying numbers of split info files correctly. NOTE: Platforms that have "makeinfo" in the base system should check that the makeinfo entries of pkgsrc/mk/tools.${OPSYS}.mk are correct.
Diffstat (limited to 'mk/bsd.pkg.use.mk')
-rw-r--r--mk/bsd.pkg.use.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index ff1fd2f2335..5786956003e 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.use.mk,v 1.27 2006/01/12 19:05:06 joerg Exp $
+# $NetBSD: bsd.pkg.use.mk,v 1.28 2006/03/05 16:27:29 jlam Exp $
#
# Turn USE_* macros into proper depedency logic. Included near the top of
# bsd.pkg.mk, after bsd.prefs.mk.
@@ -103,12 +103,11 @@ MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
LIBTOOL_OVERRIDE?= libtool */libtool */*/libtool
.endif
-### USE_MAKEINFO, INFO_FILES
+### INFO_FILES
INFO_FILES?= # empty
-USE_MAKEINFO?= no
-.if !empty(INFO_FILES) || empty(USE_MAKEINFO:M[nN][oO])
+.if !empty(INFO_FILES)
. include "../../mk/texinfo.mk"
.endif