cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uses/makeinfo.mk: Only look for makeinfo from print/texinfo

Browse Source 
If systems are updated without running `make delete-old`, makeinfo
may still be lingering around in /usr/bin. This causes eventual
errors as it can't handle brand new emerging technology from 10
years ago (like CSS).

Instead of permitting makeinfo from base (which was removed in
11.0-RELEASE), depend specifically on makeinfo from print/texinfo.

Reviewed by:	bapt
Differential Revision:	https://reviews.freebsd.org/D22795
This commit is contained in:
Adam Weinberger 2019-12-13 13:48:55 +00:00
parent faf1a5c0c6
commit 2bfb9a2816
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=520033
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mk/Uses/makeinfo.mk
View File

@ -15,11 +15,8 @@ _INCLUDE_USES_MAKEINFO_MK= yes
IGNORE= USES=makeinfo - expects no arguments
.endif
.if exists(/usr/bin/makeinfo)
MAKEINFO?= /usr/bin/makeinfo
.else
BUILD_DEPENDS+= makeinfo:print/texinfo
# Depend specifically on makeinfo from ports
BUILD_DEPENDS+= ${LOCALBASE}/bin/makeinfo:print/texinfo
MAKEINFO?= ${LOCALBASE}/bin/makeinfo
.endif
.endif