From 62fa749a40df6b0343605788644412b214cca59f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 25 Mar 2022 18:37:19 +0200 Subject: [PATCH 16/16] Msys2 Makefile: Handle ImageMagick version with a variable Now on we need to update ImageMagick version in the variable only, not in every file name it's part of. See osdn #44184 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index b4c6c7878e..1c1e737486 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -31,6 +31,7 @@ MAKE_PARAMS="-j$(shell nproc)" endif ICUVER=68 +MAGICKVER=7.Q16HDRI-7 INSTSUB=${ARCHDIR} @@ -218,8 +219,8 @@ COMMON_DLLS := \ libtermcap-0.dll \ libssp-0.dll \ libzstd.dll \ - libMagickWand-7.Q16HDRI-7.dll \ - libMagickCore-7.Q16HDRI-7.dll \ + libMagickWand-${MAGICKVER}.dll \ + libMagickCore-${MAGICKVER}.dll \ libgomp-1.dll \ libfftw3-3.dll \ liblcms2-2.dll \ @@ -364,8 +365,8 @@ RULEDIT_DLLS := \ libpcre-1.dll \ libdouble-conversion.dll \ libzstd.dll \ - libMagickWand-7.Q16HDRI-7.dll \ - libMagickCore-7.Q16HDRI-7.dll \ + libMagickWand-${MAGICKVER}.dll \ + libMagickCore-${MAGICKVER}.dll \ libgomp-1.dll \ libfftw3-3.dll \ liblcms2-2.dll \ -- 2.35.1