summaryrefslogtreecommitdiff
path: root/mk/texinfo.mk
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2003-08-16 23:19:04 +0000
committerseb <seb@pkgsrc.org>2003-08-16 23:19:04 +0000
commit53b7172739442242bd1e23f17815a3c57b21acfc (patch)
treedf9580e22f9911d4f83b9ab93cd07eb13777b365 /mk/texinfo.mk
parenta21f482039212043118d73c2e029339fc3ba9304 (diff)
downloadpkgsrc-53b7172739442242bd1e23f17815a3c57b21acfc.tar.gz
Remove setting of INSTALL_INFO and MAKEINFO in {MAKE,CONFIGURE}_ENV
from texinfo.mk. Only set them there from tools.mk: this way they are always set whatever the value of INFO_FILES and USE_MAKEINFO as texinfo.mk is included only if INFO_FILES is not empty or USE_MAKEINFO is not "no". Please note that now with tools.mk install-info and makeinfo usage by a package build and installation process is always caught by the overriding scripts in ${TOOLS_DIR}/bin/{install-info,makeinfo} even if the package does not use the buildlink framework. Many thanks to Johnny for that! XXX: I think I'm going to sweep over packages marked with INFO_FILES and USE_MAKEINFO to remove the need of INSTALL_INFO and MAKEINFO in environment and thus only relying on the overriding scripts. This will clear a bit the clutter in {MAKE,CONFIGURE}_ENV.
Diffstat (limited to 'mk/texinfo.mk')
-rw-r--r--mk/texinfo.mk26
1 files changed, 1 insertions, 25 deletions
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index fef7303e2df..8d3d95d71a9 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.20 2003/08/09 10:24:54 seb Exp $
+# $NetBSD: texinfo.mk,v 1.21 2003/08/16 23:19:04 seb Exp $
#
# This Makefile fragment is included by bsd.pkg.mk when INFO_FILES is
# not empty or USE_MAKEINFO is not "no".
@@ -48,16 +48,6 @@ FILES_SUBST+= INSTALL_INFO=${INSTALL_INFO:Q}
FILES_SUBST+= INFO_DIR=${INFO_DIR:Q}
.endif # INFO_FILES
-# When not using buildlink2 set INSTALL_INFO in environment to ${TRUE}
-# so the package build/install step does not register itself the info
-# files as this is the job of the INSTALL script.
-# This is far from being 100% robust but it is "Mostly Harmless"
-# when it fails to catch some install-info invocations.
-.if !empty(USE_BUILDLINK2:M[nN][oO])
-CONFIGURE_ENV+= INSTALL_INFO="${TRUE}"
-MAKE_ENV+= INSTALL_INFO="${TRUE}"
-.endif
-
.if empty(USE_MAKEINFO:M[nN][oO])
#
# Handle makeinfo.
@@ -121,20 +111,6 @@ MAKEINFO_ARGS+= ${_MAKEINFO_SPLIT_SIZE_ARG}
. endif
MAKEINFO= ${_MAKEINFO} ${MAKEINFO_ARGS}
. endif
-
-# When not using buildlink2 set MAKEINFO in environment to the pathname
-# of the right makeinfo command.
-. if !empty(USE_BUILDLINK2:M[nN][oO])
-CONFIGURE_ENV+= MAKEINFO="${MAKEINFO}"
-MAKE_ENV+= MAKEINFO="${MAKEINFO}"
-. endif
-
-.else # !USE_MAKEINFO
-# When not using buildlink2 set MAKEINFO in environment to ${FALSE}
-. if !empty(USE_BUILDLINK2:M[nN][oO])
-CONFIGURE_ENV+= MAKEINFO="${FALSE}"
-MAKE_ENV+= MAKEINFO="${FALSE}"
-. endif
.endif # USE_MAKEINFO
.endif # TEXINFO_MK