[gimp/wip/nielsdg/custom-vapi-dir] vapi: Add vapidir based on custom prefix



commit 17df67ce57da63d763100318eb70f4941bd75b78
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Thu Jun 4 15:55:57 2020 +0200

    vapi: Add vapidir based on custom prefix
    
    Developers who have a setup with a custom prefix can have trouble
    generating the libgimp VAPI target, because `vapigen` doesn't know how
    to look in that custom prefix (it checks its own pkgconfig file, but
    that will point to the regular prefix, unless its also built with that
    custom prefix, which happens with setups like jhbuild or buildstream).

 libgimp/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 744d3ae4a9..25aec0e91e 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -418,7 +418,7 @@ gimp_@GIMP_API_MAJOR_VERSION@_vapi_DEPS = \
        gtk+-3.0
 gimp_@GIMP_API_MAJOR_VERSION@_vapi_GIRDIRS = $(builddir)
 gimp_@GIMP_API_MAJOR_VERSION@_vapi_METADATADIRS = $(srcdir)
-gimp_@GIMP_API_MAJOR_VERSION@_vapi_VAPIDIRS = $(builddir)
+gimp_@GIMP_API_MAJOR_VERSION@_vapi_VAPIDIRS = $(builddir) $(datadir)/vala/vapi
 gimp_@GIMP_API_MAJOR_VERSION@_vapi_FILES = Gimp-@GIMP_API_VERSION@.gir
 
 gimp-$(GIMP_API_MAJOR_VERSION).deps: Makefile.am
@@ -439,7 +439,7 @@ gimp_ui_@GIMP_API_MAJOR_VERSION@_vapi_DEPS = \
 
 gimp_ui_@GIMP_API_MAJOR_VERSION@_vapi_GIRDIRS = $(builddir)
 gimp_ui_@GIMP_API_MAJOR_VERSION@_vapi_METADATADIRS = $(srcdir)
-gimp_ui_@GIMP_API_MAJOR_VERSION@_vapi_VAPIDIRS = $(builddir)
+gimp_ui_@GIMP_API_MAJOR_VERSION@_vapi_VAPIDIRS = $(builddir) $(datadir)/vala/vapi
 gimp_ui_@GIMP_API_MAJOR_VERSION@_vapi_FILES = GimpUi-@GIMP_API_VERSION@.gir
 
 gimp-ui-$(GIMP_API_MAJOR_VERSION).deps: Makefile.am


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