From 2ca18fb2c496c96563f282ff61e37931e89d90de Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 17 Aug 2017 14:28:53 +0200 Subject: [PATCH] build: Do not hardcode installation paths https://bugzilla.gnome.org/show_bug.cgi?id=786424 --- data/appdata/meson.build | 2 +- data/figures/meson.build | 4 ++-- data/icons/meson.build | 6 +++--- data/meson.build | 2 +- data/targets/meson.build | 2 +- data/ti1/meson.build | 2 +- man/meson.build | 10 +++++----- meson.build | 28 ++++++++++++---------------- src/meson.build | 7 +------ 9 files changed, 27 insertions(+), 36 deletions(-) diff --git a/data/appdata/meson.build b/data/appdata/meson.build index 63c6913..3a97041 100644 --- a/data/appdata/meson.build +++ b/data/appdata/meson.build @@ -4,5 +4,5 @@ i18n.merge_file( type: 'xml', po_dir: join_paths(meson.source_root(), 'po'), install: true, - install_dir: join_paths(get_option('datadir'), 'metainfo') + install_dir: join_paths(prefixed_datadir, 'metainfo') ) diff --git a/data/figures/meson.build b/data/figures/meson.build index 9bf6556..695429a 100644 --- a/data/figures/meson.build +++ b/data/figures/meson.build @@ -4,7 +4,7 @@ install_data([ 'viewer-example-02.png', 'viewer-example-03.png', ], - install_dir : 'share/gnome-color-manager/figures' + install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/figures') ) install_data([ @@ -16,5 +16,5 @@ install_data([ 'scan-target-good.svg', 'scan-target.svg', ], - install_dir : 'share/gnome-color-manager/icons' + install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/icons') ) diff --git a/data/icons/meson.build b/data/icons/meson.build index 9fc2ede..f1b05b3 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -4,7 +4,7 @@ foreach size: icon_sizes install_data([ size + '/gnome-color-manager.png', ], - install_dir : 'share/icons/hicolor/' + size + '/apps', + install_dir : join_paths(prefixed_datadir, 'icons/hicolor/' + size + '/apps'), ) endforeach @@ -12,7 +12,7 @@ endforeach install_data([ 'scalable/gnome-color-manager.svg', ], - install_dir : 'share/icons/hicolor/scalable/apps' + install_dir : join_paths(prefixed_datadir, 'icons/hicolor/scalable/apps') ) install_data([ @@ -20,5 +20,5 @@ install_data([ 'scalable/crt.svg', 'scalable/projector.svg', ], - install_dir : 'share/gnome-color-manager/icons/icons' + install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/icons/icons') ) diff --git a/data/meson.build b/data/meson.build index af8280f..069395c 100644 --- a/data/meson.build +++ b/data/meson.build @@ -17,6 +17,6 @@ foreach desktop_file: desktop_files type: 'desktop', po_dir: join_paths(meson.source_root(), 'po'), install: true, - install_dir: join_paths(get_option('datadir'), 'applications') + install_dir: join_paths(prefixed_datadir, 'applications') ) endforeach diff --git a/data/targets/meson.build b/data/targets/meson.build index 9f0a0c7..50d33f4 100644 --- a/data/targets/meson.build +++ b/data/targets/meson.build @@ -11,5 +11,5 @@ install_data([ 'QPcard_202.png', 'unknown.png', ], - install_dir : 'share/gnome-color-manager/targets' + install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/targets') ) diff --git a/data/ti1/meson.build b/data/ti1/meson.build index 45cbec6..c16ceed 100644 --- a/data/ti1/meson.build +++ b/data/ti1/meson.build @@ -6,5 +6,5 @@ install_data([ 'printer-normal.ti1', 'printer-short.ti1', ], - install_dir : 'share/gnome-color-manager/ti1' + install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/ti1') ) diff --git a/man/meson.build b/man/meson.build index 81d27f5..594fbb7 100644 --- a/man/meson.build +++ b/man/meson.build @@ -5,34 +5,34 @@ if docbook2man.found() input : 'gcm-calibrate.sgml', command : [docbook2man, '@INPUT@', '--output', 'man'], install : true, - install_dir : 'share/man/man1' + install_dir : join_paths(prefixed_mandir, 'man1'), ) custom_target('gcm-import-man', output : 'gcm-import.1', input : 'gcm-import.sgml', command : [docbook2man, '@INPUT@', '--output', 'man'], install : true, - install_dir : 'share/man/man1' + install_dir : join_paths(prefixed_mandir, 'man1'), ) custom_target('gcm-inspect-man', output : 'gcm-inspect.1', input : 'gcm-inspect.sgml', command : [docbook2man, '@INPUT@', '--output', 'man'], install : true, - install_dir : 'share/man/man1' + install_dir : join_paths(prefixed_mandir, 'man1'), ) custom_target('gcm-picker-man', output : 'gcm-picker.1', input : 'gcm-picker.sgml', command : [docbook2man, '@INPUT@', '--output', 'man'], install : true, - install_dir : 'share/man/man1' + install_dir : join_paths(prefixed_mandir, 'man1'), ) custom_target('gcm-viewer-man', output : 'gcm-viewer.1', input : 'gcm-viewer.sgml', command : [docbook2man, '@INPUT@', '--output', 'man'], install : true, - install_dir : 'share/man/man1' + install_dir : join_paths(prefixed_mandir, 'man1'), ) endif diff --git a/meson.build b/meson.build index 917c5db..771a028 100644 --- a/meson.build +++ b/meson.build @@ -80,6 +80,13 @@ add_global_link_arguments( language: 'c' ) +prefixed_bindir = join_paths(get_option('prefix'), get_option('bindir')) +prefixed_localedir = join_paths(get_option('prefix'), get_option('localedir')) +prefixed_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir')) +prefixed_mandir = join_paths(get_option('prefix'), get_option('mandir')) +prefixed_datadir = join_paths(get_option('prefix'), get_option('datadir')) +prefixed_pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'gnome-software') + libgio = dependency('gio-2.0', version : '>= 2.25.9') libgtk = dependency('gtk+-3.0', version : '>= 2.91.0') libexif = dependency('libexif') @@ -109,22 +116,11 @@ gnome = import('gnome') i18n = import('i18n') conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) -conf.set_quoted('LOCALEDIR', - join_paths(get_option('prefix'), - get_option('localedir'))) -conf.set_quoted('DATADIR', - join_paths(get_option('prefix'), - get_option('datadir'))) -conf.set_quoted('PKGDATADIR', - join_paths(get_option('prefix'), - get_option('datadir'), - 'gnome-software')) -conf.set_quoted('BINDIR', - join_paths(get_option('prefix'), - get_option('bindir'))) -conf.set_quoted('LIBEXECDIR', - join_paths(get_option('prefix'), - get_option('libexecdir'))) +conf.set_quoted('LOCALEDIR', prefixed_localedir) +conf.set_quoted('DATADIR', prefixed_datadir) +conf.set_quoted('PKGDATADIR', prefixed_pkgdatadir) +conf.set_quoted('BINDIR', prefixed_bindir) +conf.set_quoted('LIBEXECDIR', prefixed_libexecdir) configure_file( output : 'config.h', configuration : conf diff --git a/src/meson.build b/src/meson.build index ebf0b04..73ba87c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -29,7 +29,7 @@ if get_option('enable-exiv') ], c_args : cargs, install : true, - install_dir : 'libexec', + install_dir : prefixed_libexecdir, ) endif @@ -74,7 +74,6 @@ executable( ], c_args : cargs, install : true, - install_dir : 'bin' ) executable( @@ -96,7 +95,6 @@ executable( ], c_args : cargs, install : true, - install_dir : 'bin' ) executable( @@ -118,7 +116,6 @@ executable( ], c_args : cargs, install : true, - install_dir : 'bin' ) executable( @@ -142,7 +139,6 @@ executable( ], c_args : cargs, install : true, - install_dir : 'bin' ) executable( @@ -169,7 +165,6 @@ executable( ], c_args : cargs, install : true, - install_dir : 'bin' ) if get_option('enable-tests') -- 2.13.3