update path to Dejavu fonts

ImageMagick · Sep 16, 2024 · 404518f · 404518f
1 parent 06a2806
commit 404518f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/configure b/configure
@@ -5143,7 +5143,7 @@ MAGICK_PATCHLEVEL_VERSION=17
 
 MAGICK_VERSION=6.9.13-17
 
-MAGICK_GIT_REVISION=7875b2453:20240915
+MAGICK_GIT_REVISION=06a280623:20240916
 
 
 # Substitute library versioning
@@ -5177,7 +5177,7 @@ PACKAGE_LIB_VERSION=0x69D
 
 PACKAGE_LIB_VERSION_NUMBER=6,9,13,17
 
-PACKAGE_RELEASE_DATE=2024-09-15
+PACKAGE_RELEASE_DATE=2024-09-16
 
 
 # Ensure that make can run correctly
@@ -36313,7 +36313,7 @@ dejavu_font_dir=''
 if test "${with_dejavu_font_dir}" != 'default'; then
   dejavu_font_dir="${with_dejavu_font_dir}/"
 else
-  for font_dir in "${prefix}/share/dejavu/fonts/" '/usr/share/fonts/dejavu/'; do
+  for font_dir in "${prefix}/share/fonts/dejavu" "${prefix}/share/dejavu-serif-fonts/fonts/" '/usr/share/fonts/dejavu-serif-fonts/' '/usr/share/fonts/truetype/dejavu/'; do
     if test -f "${font_dir}DejaVuSerif.ttf"; then
       dejavu_font_dir="${font_dir}"
       break 1

diff --git a/configure.ac b/configure.ac
@@ -3256,7 +3256,7 @@ dejavu_font_dir=''
 if test "${with_dejavu_font_dir}" != 'default'; then
   dejavu_font_dir="${with_dejavu_font_dir}/"
 else
-  for font_dir in "${prefix}/share/dejavu/fonts/" '/usr/share/fonts/dejavu/'; do
+  for font_dir in "${prefix}/share/fonts/dejavu" "${prefix}/share/dejavu-serif-fonts/fonts/" '/usr/share/fonts/dejavu-serif-fonts/' '/usr/share/fonts/truetype/dejavu/'; do
     if test -f "${font_dir}DejaVuSerif.ttf"; then
       dejavu_font_dir="${font_dir}"
       break 1