summaryrefslogtreecommitdiff
path: root/mk/buildlink2
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2003-07-31 13:50:11 +0000
committerseb <seb@pkgsrc.org>2003-07-31 13:50:11 +0000
commit16437cbe4ceb476b6cc7b2573019d549797408a1 (patch)
tree9640ecbce9b4a6144936336ee4ed63e9ebea8431 /mk/buildlink2
parent30c404c8a02c5f0a6b22fa955898946e347d416a (diff)
downloadpkgsrc-16437cbe4ceb476b6cc7b2573019d549797408a1.tar.gz
Make it possible to have a package requiring makeinfo but not install-info.
INFO_FILES is now defined by default to the empty value. If it is not empty it means that install-info -or a suitable replacement like pkg_install-info- is required. USE_MAKEINFO is now defined by default to the 'no' value. If it has any other value it means that makeinfo is required. Note that as before simply defining USE_MAKEINFO in a package Makefile is enough to trigger the use of makeinfo. I.e. it is not required to be '[yY][eE][sS]'. As a side effect when using buildlink2 always create install-info and makeinfo wrappers in ${BUILDLINK_DIR}/bin. This could help package maintainer to catch spurious/hidden install-info and makeinfo usage. Note that for now this nice feature is not really enabled as the relevant part of bsd.buildlink2.mk is still conditional upon USE_NEW_TEXINFO. It will really be when USE_NEW_TEXINFO will be removed from pkgsrc.
Diffstat (limited to 'mk/buildlink2')
-rw-r--r--mk/buildlink2/bsd.buildlink2.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index 38df83d09ec..78e22080f8c 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.91 2003/07/22 01:10:32 seb Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.92 2003/07/31 13:50:13 seb Exp $
#
# An example package buildlink2.mk file:
#
@@ -1028,7 +1028,6 @@ ${BUILDLINK_DIR}/${_prog_}: ${_GNU_MISSING}
.if defined(USE_NEW_TEXINFO)
# install-info and makeinfo handling.
#
-.if defined(INFO_FILES)
# Create an install-info script that is a "no operation" command
# as registration of info files is handled by the INSTALL script.
CONFIGURE_ENV+= INSTALL_INFO="${BUILDLINK_DIR}/bin/install-info"
@@ -1075,5 +1074,4 @@ ${BUILDLINK_DIR}/bin/makeinfo: ${_GNU_MISSING}
${ECHO} 'exit 1' >> ${.TARGET}
${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
. endif # USE_MAKEINFO
-.endif # INFO_FILES
.endif # USE_NEW_TEXINFO