[librsvg: 1/2] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR




commit e798ce32d641b3f53a2ae8cef64c23c6f44dc15c
Author: Fabrice Fontaine <fontaine fabrice gmail com>
Date:   Sat Feb 19 12:22:43 2022 +0000

    gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR
    
    Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling
    gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and
    gdk-pixbuf.loaders on 'exotic' systems
    
    Signed-off-by: Fabrice Fontaine <fontaine fabrice gmail com>
    Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668>

 gdk-pixbuf-loader/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am
index 7be9ce42f..44df9c6c4 100644
--- a/gdk-pixbuf-loader/Makefile.am
+++ b/gdk-pixbuf-loader/Makefile.am
@@ -51,7 +51,7 @@ rsvg_loader_LDADD = \
 EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders
 
 gdk-pixbuf-loaders: Makefile
-       $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > 
gdk-pixbuf.loaders 2>/dev/null
+       $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && 
GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
 
 if CROSS_COMPILING
 RUN_QUERY_LOADER_TEST=false
@@ -70,7 +70,7 @@ endif
 install-data-hook:
        @if $(RUN_QUERY_LOADER_TEST) ; then \
                $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \
-               $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \
+               GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > 
$(DESTDIR)$(gdk_pixbuf_cache_file) ; \
        else \
          echo "***" ; \
          echo "*** Warning: loaders.cache not built" ; \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]