From 81aae8fba40d6b5f26b18a560b77c7bc042066fb Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Mon, 20 Jul 2015 23:38:11 +0000 Subject: [PATCH] - Fix an error with fmake. [*] - Allow "agpl" as an additional keyword in GHOSTSCRIPT_DEFAULT. Spotted by: kib [*] --- Mk/Uses/ghostscript.mk | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk index 12f4618f3fc0..d6d268744f70 100644 --- a/Mk/Uses/ghostscript.mk +++ b/Mk/Uses/ghostscript.mk @@ -65,18 +65,23 @@ _GS_RUN_DEP= yes .undef _GS_AGPL_SUFFIX .undef _GS_SELECTED .for V in ${_GS_ARGS} ${GHOSTSCRIPT_DEFAULT} -.if ${V:M9} +_V=${V} +.if ${_V:M9} _GS_SELECTED?= 9 -.elif ${V:M9.06} +.elif ${_V:M9.06} _GS_SELECTED?= 9 -.elif ${V:M9.16} +.elif ${_V:M9.16} _GS_SELECTED?= 9 _GS_AGPL_SUFFIX?= -agpl -.elif ${V:Magpl} && defined(_GS_SELECTED) && !empty(_GS_SELECTED:N9) +.elif ${_V:Magpl} && defined(_GS_SELECTED) +.if ${_GS_SELECTED:M9} +_GS_AGPL_SUFFIX?= -agpl +.else IGNORE= Ghostscript-agpl is only available in version 9 -.elif ${V:M8} +.endif +.elif ${_V:M8} _GS_SELECTED?= 8 -.elif ${V:M7} +.elif ${_V:M7} _GS_SELECTED?= 7 .endif .endfor