diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2019-12-13 13:48:55 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2019-12-13 13:48:55 +0000 |
| commit | 2bfb9a281694f10161bf77a5e9ab9418be6ec060 (patch) | |
| tree | ecd0f45b46f215cac23ebe85655a93d18475fc11 /Mk/Uses/makeinfo.mk | |
| parent | Provide a new macro NCURSES_IMPL (diff) | |
Uses/makeinfo.mk: Only look for makeinfo from print/texinfo
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
Notes
Notes:
svn path=/head/; revision=520033
Diffstat (limited to 'Mk/Uses/makeinfo.mk')
| -rw-r--r-- | Mk/Uses/makeinfo.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Mk/Uses/makeinfo.mk b/Mk/Uses/makeinfo.mk index a04e699e215a..a21d660f1085 100644 --- a/Mk/Uses/makeinfo.mk +++ b/Mk/Uses/makeinfo.mk @@ -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 |