Mercurial > pidgin3 / changeset

--- a/doc/meson.build	Fri Jun 16 20:02:45 2017 -0400
+++ b/doc/meson.build	Sat Jun 17 02:00:42 2017 -0400
@@ -6,7 +6,7 @@
 	pidgin_man = configure_file(
 	    input : 'pidgin.1.in',
 	    output : 'pidgin.1',
-	    configuration : conf,
+	    configuration : man_conf,
 	    install : true,
 	    install_dir : get_option('mandir') + '/man1')
 endif
@@ -15,7 +15,7 @@
 	finch_man = configure_file(
 	    input : 'finch.1.in',
 	    output : 'finch.1',
-	    configuration : conf,
+	    configuration : man_conf,
 	    install : true,
 	    install_dir : get_option('mandir') + '/man1')
 endif

--- a/finch/libgnt/meson.build	Fri Jun 16 20:02:45 2017 -0400
+++ b/finch/libgnt/meson.build	Sat Jun 17 02:00:42 2017 -0400
@@ -92,7 +92,7 @@
 
 configure_file(input : 'gnt.pc.in',
                output : 'gnt.pc',
-               configuration : conf,
+               configuration : pkg_conf,
                install : true,
                install_dir : get_option('libdir') + '/pkgconfig')
 

--- a/finch/meson.build	Fri Jun 16 20:02:45 2017 -0400
+++ b/finch/meson.build	Sat Jun 17 02:00:42 2017 -0400
@@ -95,7 +95,7 @@
 
 	configure_file(input : 'finch.pc.in',
 	               output : 'finch.pc',
-	               configuration : conf,
+	               configuration : pkg_conf,
 	               install : true,
 	               install_dir : get_option('libdir') + '/pkgconfig')
 

--- a/libpurple/meson.build	Fri Jun 16 20:02:45 2017 -0400
+++ b/libpurple/meson.build	Sat Jun 17 02:00:42 2017 -0400
@@ -454,7 +454,7 @@
 
 configure_file(input : 'data/purple-3.pc.in',
                output : 'purple-3.pc',
-               configuration : conf,
+               configuration : pkg_conf,
                install : true,
                install_dir : get_option('libdir') + '/pkgconfig')
 

--- a/meson.build	Fri Jun 16 20:02:45 2017 -0400
+++ b/meson.build	Sat Jun 17 02:00:42 2017 -0400
@@ -69,6 +69,8 @@
 
 add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c')
 conf = configuration_data()
+man_conf = configuration_data()
+pkg_conf = configuration_data()
 version_conf = configuration_data()
 
 conf.set('PACKAGE', '"@0@"'.format(meson.project_name()))
@@ -103,6 +105,22 @@
     output : 'package_revision.h',
     fallback : meson.project_version())
 
+# For man pages.
+man_conf.set('VERSION', purple_display_version)
+man_conf.set('prefix', get_option('prefix'))
+
+# This is used for pkg-config files. This probably can be removed and the
+# builtin generator used instead once we drop the Autotools build.
+pkg_conf.set('VERSION', purple_display_version)
+pkg_conf.set('PURPLE_MAJOR_VERSION', purple_major_version)
+pkg_conf.set('prefix', get_option('prefix'))
+pkg_conf.set('exec_prefix', '${prefix}')
+pkg_conf.set('libdir', join_paths('${exec_prefix}', get_option('libdir')))
+pkg_conf.set('includedir', join_paths('${prefix}', get_option('includedir')))
+pkg_conf.set('datarootdir', join_paths('${prefix}', get_option('datadir')))
+pkg_conf.set('datadir', '${datarootdir}')
+pkg_conf.set('sysconfdir', join_paths('${prefix}', get_option('sysconfdir')))
+
 sedpath = find_program('sed')
 
 # Storing configure arguments
@@ -1215,8 +1233,8 @@
 #######################################################################
 if get_option('plugins')
 	gplugin = dependency('gplugin', version : '>= 0.0.17')
-	# GPLUGIN_REG sets pkg-config requirements in the .pc file
-	conf.set('GPLUGIN_REQ', ', gplugin')
+	# GPLUGIN_REQ sets pkg-config requirements in the .pc file
+	pkg_conf.set('GPLUGIN_REQ', ', gplugin')
 	enable_introspection = true
 else
 	gplugin = []

--- a/pidgin/meson.build	Fri Jun 16 20:02:45 2017 -0400
+++ b/pidgin/meson.build	Sat Jun 17 02:00:42 2017 -0400
@@ -175,7 +175,7 @@
 
 	configure_file(input : 'data/pidgin-3.pc.in',
 	               output : 'pidgin-3.pc',
-	               configuration : conf,
+	               configuration : pkg_conf,
 	               install : true,
 	               install_dir : get_option('libdir') + '/pkgconfig')