diff options
| author | seb <seb@pkgsrc.org> | 2003-08-09 10:24:54 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2003-08-09 10:24:54 +0000 |
| commit | 0d0e9d3ac1afe11c9684cb792d11834d87107829 (patch) | |
| tree | a247611f2156465bd69f45a40526f0dff04609c4 /mk/buildlink2 | |
| parent | 305e2372e88f5057719104b292d0e14ae29819c0 (diff) | |
| download | pkgsrc-0d0e9d3ac1afe11c9684cb792d11834d87107829.tar.gz | |
USE_NEW_TEXINFO is now ubiquitous. Remove conditionals on it.
Also remove the older texinfo.mk framework as well as the previous
handling of INFO_FILES, all this is not used anymore.
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 78e22080f8c..bc5c9415d1a 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.92 2003/07/31 13:50:13 seb Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.93 2003/08/09 10:24:54 seb Exp $ # # An example package buildlink2.mk file: # @@ -1025,7 +1025,6 @@ ${BUILDLINK_DIR}/${_prog_}: ${_GNU_MISSING} . endfor .endfor -.if defined(USE_NEW_TEXINFO) # install-info and makeinfo handling. # # Create an install-info script that is a "no operation" command @@ -1049,7 +1048,7 @@ ${BUILDLINK_DIR}/bin/install-info: CONFIGURE_ENV+= MAKEINFO="${BUILDLINK_DIR}/bin/makeinfo" MAKE_ENV+= MAKEINFO="${BUILDLINK_DIR}/bin/makeinfo" -. if empty(USE_MAKEINFO:M[nN][oO]) +.if empty(USE_MAKEINFO:M[nN][oO]) do-buildlink: makeinfo-wrapper makeinfo-wrapper: ${BUILDLINK_DIR}/bin/makeinfo ${BUILDLINK_DIR}/bin/makeinfo: @@ -1061,7 +1060,7 @@ ${BUILDLINK_DIR}/bin/makeinfo: ${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO} 'exec ${MAKEINFO} "$$@"' >> ${.TARGET} ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} -. else # !USE_MAKEINFO +.else # !USE_MAKEINFO do-buildlink: hide-makeinfo hide-makeinfo: ${BUILDLINK_DIR}/bin/makeinfo ${BUILDLINK_DIR}/bin/makeinfo: ${_GNU_MISSING} @@ -1073,5 +1072,4 @@ ${BUILDLINK_DIR}/bin/makeinfo: ${_GNU_MISSING} ${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO} 'exit 1' >> ${.TARGET} ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} -. endif # USE_MAKEINFO -.endif # USE_NEW_TEXINFO +.endif # USE_MAKEINFO |