[libgda/LIBGDA_5.2] Release 5.2.10



commit 85a2532df64698306fd3be324bb2052fb1b80fd3
Author: Daniel Espinosa <esodan gmail com>
Date:   Sun Nov 8 18:57:22 2020 -0600

    Release 5.2.10
    
    * Fix Vala bindings generation
    * Fix Glade catalog and pixmaps installation for make distcheck

 NEWS                        | 2 ++
 libgda-ui/glade/Makefile.am | 4 ++--
 libgda/Makefile.am          | 9 +++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index 1dac982ed..3c905e4eb 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,9 @@ libgda 5.2.10
  - GdaParser: remove spaces and enters before next statement, fix 203
  - GdauiSet: fix gdaui_set_source_get_ref_columns() return value, fix #123
  - SqlParser: fix Vala bindings
+ - Vala: added missing variadic methods to VAPI
  - Removing Python 2 support to use Python 3 by default
+ - Glade catalog and pixmaps installation directory fixed for make distcheck
 
 libgda 5.2.9
  - Fix Sun JRE 1.8 detection
diff --git a/libgda-ui/glade/Makefile.am b/libgda-ui/glade/Makefile.am
index 9031f73ee..3155e2f3a 100644
--- a/libgda-ui/glade/Makefile.am
+++ b/libgda-ui/glade/Makefile.am
@@ -1,5 +1,5 @@
 glade_catalog_DATA = gdaui-catalog.xml
-glade_catalogdir = $(GLADE_CATALOG)
+glade_catalogdir = $(datadir)/glade/catalogs
 
 glade_pixmap_DATA = \
        widget-gdaui-gdauigrid.png \
@@ -9,7 +9,7 @@ glade_pixmap_DATA = \
        widget-gdaui-gdauirawgrid.png
 
 
-glade_pixmapdir = $(GLADE_PIXMAP)
+glade_pixmapdir = $(datadir)/glade/pixmaps
 
 EXTRA_DIST = \
        $(glade_catalog_DATA) \
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 31d982345..410fc5e07 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -363,7 +363,11 @@ if ENABLE_VAPIGEN
 vapi: libgda-5.0.vapi
 
 libgda-5.0.vapi: Gda-5.0.gir
-       $(VAPIGEN) --metadatadir=$(top_srcdir)/libgda --library libgda-5.0 --pkg libxml-2.0 Gda-5.0.gir 
Gda-5.0-custom.vala
+       $(VAPIGEN) --metadatadir=$(top_srcdir)/libgda \
+               --library libgda-5.0 \
+               --pkg libxml-2.0 \
+               Gda-5.0.gir \
+               $(top_srcdir)/libgda/Gda-5.0-custom.vala
 
 vapidir = $(datadir)/vala/vapi
 vapi_DATA=libgda-5.0.vapi
@@ -373,4 +377,5 @@ CLEANFILES += $(vapi_DATA)
 endif
 
 EXTRA_DIST += \
-       Gda-5.0.metadata
+       Gda-5.0.metadata \
+       Gda-5.0-custom.vala


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