diff --git a/docs/meson.build b/docs/meson.build index 057662688732802d3023ce5a5b49f5525ec1b9b0..91057c3d3b6ffad9b55fe54af95e904be9dffff9 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -3,7 +3,7 @@ outdir ='GXml-'+API_VERSION valacapi = run_command ('valac', '--api-version') driver = '--driver='+valacapi.stdout().strip() pkgname = '--package-name='+'GXml-'+API_VERSION -pkgversion = '--package-version='+GXML_VERSION +pkgversion = '--package-version='+PROJECT_VERSION vapidirgxml = '--vapidir='+join_paths (meson.current_source_dir (),'gxml') vapidirvapi = '--vapidir='+join_paths (meson.current_source_dir (),'vapi') docsdir = join_paths (get_option ('datadir'), 'devhelp','books') diff --git a/gxml/meson.build b/gxml/meson.build index 3471fc2215f7c18d9cfb3f08c1ad3c928c6e7c74..5c2f1b7af1793068d7e09218b9ecae6175f42ba3 100644 --- a/gxml/meson.build +++ b/gxml/meson.build @@ -7,7 +7,7 @@ conf.set('libdir', join_paths (get_option ('prefix'),get_option ('libdir'))) conf.set('includedir', get_option ('includedir')) conf.set('VALADEPS', VALADEPS) conf.set('PCDEPS', PCDEPS) -conf.set('GXML_VERSION', GXML_VERSION) +conf.set('GXML_VERSION', PROJECT_VERSION) conf.set('API_VERSION', API_VERSION) configure_file(input : 'gxml.pc.in', @@ -127,7 +127,7 @@ inc_gxmlh = include_directories ('.') gxml = library('gxml-@0@'.format(API_VERSION), valasources+sources+configvapi, - version : GXML_VERSION, + version : PROJECT_VERSION, vala_header : 'gxml.h', vala_vapi : 'gxml-@0@.vapi'.format(API_VERSION), vala_gir : 'GXml-@0@.gir'.format(API_VERSION), diff --git a/meson.build b/meson.build index 5c2f4939c863b21c0fb28125361d633c26d22e7a..cc983f748b4b3e126c340e8c39c8e9d72bbb3813 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,7 @@ VALADEPS = 'gee-0.8\ngio-2.0\nlibxml-2.0' PCDEPS = 'gee-0.8 gio-2.0 libxml-2.0' API_VERSION = '0.14' -GXML_VERSION = '0.15.0' +PROJECT_VERSION = '0.15.0' xlibxml_cflags = '-I' + meson.current_source_dir()