[libgda] Meson: Fix libgda-6.0.pc configure



commit eeba50dd7308a87b38f702661a07acc57ad7bffe
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Sep 21 14:56:05 2018 -0500

    Meson: Fix libgda-6.0.pc configure

 meson.build | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 177502b45..e24864065 100644
--- a/meson.build
+++ b/meson.build
@@ -148,13 +148,13 @@ if glib_mkenums.found()
 else
   error ('glib-mkenums not found')
 endif
-conf.set('GDA_ABI_MAJOR_VERSION', MAJOR_VERSION)
-conf.set('GDA_ABI_MINOR_VERSION', MINOR_VERSION)
+conf.set('GDA_ABI_MAJOR_VERSION', API_MAJOR_VERSION)
+conf.set('GDA_ABI_MINOR_VERSION', API_MINOR_VERSION)
 conf.set('VERSION', project_version)
 conf.set('prefix', get_option('prefix'))
-conf.set('exec_prefix', get_option('libexecdir'))
-conf.set('libdir', get_option('libdir'))
-conf.set('includedir', get_option('includedir'))
+conf.set('exec_prefix', join_paths (get_option('prefix'), get_option('libexecdir')))
+conf.set('libdir', join_paths (get_option('prefix'), get_option('libdir')))
+conf.set('includedir', join_paths (get_option('prefix'), get_option('includedir')))
 conf.set('GDA_DEBUG_FLAGS', '')
 if lbdb_found
        conf.set('LIBGDA_BDB_INC', '#include <libgda/gda-data-model-bdb.h>')


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