diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-11-16 03:15:00 +0100 |
---|---|---|
committer | Richard Hughes <richard@hughsie.com> | 2017-11-17 15:55:29 +0000 |
commit | f08c25ddd93ad3fa691172119a038465cd178420 (patch) | |
tree | 9d38bf6e48510ee3cd0d352262fe3df90ea2c010 | |
parent | af18fd29cf99e32a1a1a0ede4239f2c41a1f3811 (diff) | |
download | colord-f08c25ddd93ad3fa691172119a038465cd178420.tar.gz |
build: Refactor directory selection
Previously, the various install paths were obtained using get_option
as needed. This lead to the directories sometimes not prepended with
prefix.
This patch unifies the directory selection inside the top-level meson
file.
-rw-r--r-- | client/meson.build | 10 | ||||
-rw-r--r-- | contrib/colord-sane/meson.build | 2 | ||||
-rw-r--r-- | contrib/session-helper/meson.build | 10 | ||||
-rw-r--r-- | data/cmf/meson.build | 2 | ||||
-rw-r--r-- | data/figures/meson.build | 2 | ||||
-rw-r--r-- | data/illuminant/meson.build | 2 | ||||
-rw-r--r-- | data/meson.build | 8 | ||||
-rw-r--r-- | data/profiles/meson.build | 2 | ||||
-rw-r--r-- | data/ref/meson.build | 2 | ||||
-rw-r--r-- | data/tests/meson.build | 2 | ||||
-rw-r--r-- | data/ti1/meson.build | 2 | ||||
-rw-r--r-- | lib/colord/meson.build | 4 | ||||
-rw-r--r-- | lib/colorhug/meson.build | 2 | ||||
-rw-r--r-- | lib/compat/meson.build | 2 | ||||
-rw-r--r-- | man/meson.build | 8 | ||||
-rw-r--r-- | meson.build | 41 | ||||
-rw-r--r-- | policy/meson.build | 4 | ||||
-rw-r--r-- | src/meson.build | 4 | ||||
-rw-r--r-- | src/plugins/meson.build | 8 | ||||
-rw-r--r-- | src/sensors/argyll/meson.build | 2 | ||||
-rw-r--r-- | src/sensors/colorhug/meson.build | 2 | ||||
-rw-r--r-- | src/sensors/dtp94/meson.build | 2 | ||||
-rw-r--r-- | src/sensors/dummy/meson.build | 2 | ||||
-rw-r--r-- | src/sensors/huey/meson.build | 2 | ||||
-rw-r--r-- | src/sensors/spark/meson.build | 2 |
25 files changed, 60 insertions, 69 deletions
diff --git a/client/meson.build b/client/meson.build index 981b54b..ae2fe0c 100644 --- a/client/meson.build +++ b/client/meson.build @@ -20,7 +20,7 @@ executable( cargs, ], install : true, - install_dir : get_option('bindir') + install_dir : bindir ) executable( @@ -43,7 +43,7 @@ executable( cargs, ], install : true, - install_dir : get_option('bindir') + install_dir : bindir ) executable( @@ -66,7 +66,7 @@ executable( cargs, ], install : true, - install_dir : get_option('bindir') + install_dir : bindir ) cd_idt8 = executable( @@ -89,7 +89,7 @@ cd_idt8 = executable( cargs, ], install : true, - install_dir : get_option('bindir') + install_dir : bindir ) cd_create_profile = executable( @@ -112,5 +112,5 @@ cd_create_profile = executable( cargs, ], install : true, - install_dir : get_option('bindir') + install_dir : bindir ) diff --git a/contrib/colord-sane/meson.build b/contrib/colord-sane/meson.build index 9967302..77c98f1 100644 --- a/contrib/colord-sane/meson.build +++ b/contrib/colord-sane/meson.build @@ -21,5 +21,5 @@ executable( cargs, ], install : true, - install_dir : get_option('libexecdir') + install_dir : libexecdir ) diff --git a/contrib/session-helper/meson.build b/contrib/session-helper/meson.build index ffff770..2ce7b23 100644 --- a/contrib/session-helper/meson.build +++ b/contrib/session-helper/meson.build @@ -1,7 +1,7 @@ cargs = ['-DG_LOG_DOMAIN="Cd"'] install_data('org.freedesktop.ColorHelper.xml', - install_dir : join_paths(get_option('datadir'), 'dbus-1', 'interfaces') + install_dir : join_paths(datadir, 'dbus-1', 'interfaces') ) install_headers( @@ -10,9 +10,7 @@ install_headers( ) con2 = configuration_data() -con2.set('servicedir', - join_paths(get_option('prefix'), - get_option('libexecdir'))) +con2.set('servicedir', libexecdir) # replace @servicedir@ if get_option('enable-systemd') @@ -31,7 +29,7 @@ configure_file( output : 'org.freedesktop.ColorHelper.service', configuration : con2, install: true, - install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services') , + install_dir: join_paths(datadir, 'dbus-1', 'services') , ) executable( @@ -59,7 +57,7 @@ executable( cargs, ], install : true, - install_dir : get_option('libexecdir') + install_dir : libexecdir ) install_data('org.freedesktop.ColorHelper.gschema.xml', diff --git a/data/cmf/meson.build b/data/cmf/meson.build index 802d974..a693cd7 100644 --- a/data/cmf/meson.build +++ b/data/cmf/meson.build @@ -4,6 +4,6 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ] output: arg + '.cmf', command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ], install: true, - install_dir: join_paths(get_option('datadir'), 'colord', 'cmf') + install_dir: join_paths(datadir, 'colord', 'cmf') ) endforeach diff --git a/data/figures/meson.build b/data/figures/meson.build index 87297ce..74eae9e 100644 --- a/data/figures/meson.build +++ b/data/figures/meson.build @@ -18,5 +18,5 @@ install_data([ 'spyder4-attach.svg', 'spyder5-attach.svg', ], - install_dir: join_paths(get_option('datadir'), 'colord', 'icons') + install_dir: join_paths(datadir, 'colord', 'icons') ) diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build index 5d1fa6b..f8dfa07 100644 --- a/data/illuminant/meson.build +++ b/data/illuminant/meson.build @@ -26,6 +26,6 @@ foreach arg: generated_spectra output: arg + '.sp', command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ], install: true, - install_dir: join_paths(get_option('datadir'), 'colord', 'illuminant') + install_dir: join_paths(datadir, 'colord', 'illuminant') ) endforeach diff --git a/data/meson.build b/data/meson.build index f5ce3a7..c27bfcd 100644 --- a/data/meson.build +++ b/data/meson.build @@ -19,9 +19,7 @@ if get_option('enable-bash-completion') endif con2 = configuration_data() -con2.set('servicedir', - join_paths(get_option('prefix'), - get_option('libexecdir'))) +con2.set('servicedir', libexecdir) con2.set('daemon_user', get_option('with-daemon-user')) # replace @servicedir@ and @daemon_user@ @@ -41,7 +39,7 @@ configure_file( output : 'org.freedesktop.ColorManager.service', configuration : con2, install: true, - install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system-services') , + install_dir: join_paths(datadir, 'dbus-1', 'system-services') , ) # replace @daemon_user@ @@ -50,5 +48,5 @@ configure_file( output : 'org.freedesktop.ColorManager.conf', configuration : con2, install: true, - install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d') , + install_dir: join_paths(datadir, 'dbus-1', 'system.d') , ) diff --git a/data/profiles/meson.build b/data/profiles/meson.build index c2390e9..37c1b62 100644 --- a/data/profiles/meson.build +++ b/data/profiles/meson.build @@ -61,7 +61,7 @@ foreach arg: icc_profiles output: arg + '.icc', command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ], install: true, - install_dir: join_paths(get_option('datadir'), 'color', 'icc', 'colord'), + install_dir: join_paths(datadir, 'color', 'icc', 'colord'), ) generated_iccs += generated_icc endforeach diff --git a/data/ref/meson.build b/data/ref/meson.build index 6b2aa21..e244ab2 100644 --- a/data/ref/meson.build +++ b/data/ref/meson.build @@ -2,5 +2,5 @@ install_data([ 'CIE-1986-daylight-SPD.cmf', 'CIE-TCS.sp', ], - install_dir: join_paths(get_option('datadir'), 'colord', 'ref') + install_dir: join_paths(datadir, 'colord', 'ref') ) diff --git a/data/tests/meson.build b/data/tests/meson.build index 366e692..dee394d 100644 --- a/data/tests/meson.build +++ b/data/tests/meson.build @@ -17,6 +17,6 @@ if get_option('enable-installed-tests') 'test.ccss', 'test.sp', ], - install_dir: join_paths(get_option('libexecdir'), 'installed-tests', 'colord') + install_dir: join_paths(libexecdir, 'installed-tests', 'colord') ) endif diff --git a/data/ti1/meson.build b/data/ti1/meson.build index 6ef11d4..890312f 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: join_paths(get_option('datadir'), 'colord', 'ti1') + install_dir: join_paths(datadir, 'colord', 'ti1') ) diff --git a/lib/colord/meson.build b/lib/colord/meson.build index aed01e8..47ff08c 100644 --- a/lib/colord/meson.build +++ b/lib/colord/meson.build @@ -213,9 +213,7 @@ endif if get_option('enable-installed-tests') con2 = configuration_data() con2.set('installedtestsdir', - join_paths(get_option('prefix'), - get_option('libexecdir'), - 'installed-tests', 'colord')) + join_paths(libexecdir, 'installed-tests', 'colord')) configure_file( input : 'colord-daemon.test.in', output : 'colord-daemon.test', diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build index 6a54f38..054e499 100644 --- a/lib/colorhug/meson.build +++ b/lib/colorhug/meson.build @@ -12,7 +12,7 @@ colorhug_version_h = configure_file( output : 'ch-version.h', configuration : ch_version_h_conf, install : true, - install_dir: join_paths(get_option('includedir'), 'colord-1/colorhug'), + install_dir: join_paths(includedir, 'colord-1', 'colorhug'), ) install_headers( diff --git a/lib/compat/meson.build b/lib/compat/meson.build index 5963801..e6a8fa6 100644 --- a/lib/compat/meson.build +++ b/lib/compat/meson.build @@ -13,7 +13,7 @@ shared_module('colordcompat', root_incdir, ], install : true, - install_dir: get_option('libdir'), + install_dir: libdir, c_args : cargs, link_with : colord, dependencies : [ diff --git a/man/meson.build b/man/meson.build index f277959..c0b66ac 100644 --- a/man/meson.build +++ b/man/meson.build @@ -7,7 +7,7 @@ custom_target('colormgr-man', '--output', meson.current_build_dir(), ], install : true, - install_dir : join_paths(get_option('mandir'), 'man1'), + install_dir : join_paths(mandir, 'man1'), ) custom_target('cd-create-profile-man', input : 'cd-create-profile.sgml', @@ -17,7 +17,7 @@ custom_target('cd-create-profile-man', '--output', meson.current_build_dir(), ], install : true, - install_dir : join_paths(get_option('mandir'), 'man1'), + install_dir : join_paths(mandir, 'man1'), ) custom_target('cd-fix-profile-man', input : 'cd-fix-profile.sgml', @@ -27,7 +27,7 @@ custom_target('cd-fix-profile-man', '--output', meson.current_build_dir(), ], install : true, - install_dir : join_paths(get_option('mandir'), 'man1'), + install_dir : join_paths(mandir, 'man1'), ) custom_target('cd-it8-man', input : 'cd-it8.sgml', @@ -37,5 +37,5 @@ custom_target('cd-it8-man', '--output', meson.current_build_dir(), ], install : true, - install_dir : join_paths(get_option('mandir'), 'man1'), + install_dir : join_paths(mandir, 'man1'), ) diff --git a/meson.build b/meson.build index 7cc4ccf..f0801e4 100644 --- a/meson.build +++ b/meson.build @@ -202,25 +202,25 @@ add_project_arguments('-DCD_COMPILATION', language: 'c') # Needed for realpath() and PATH_MAX add_project_arguments('-D_XOPEN_SOURCE=500', language : 'c') -conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) -conf.set_quoted('BINDIR', - join_paths(get_option('prefix'), - get_option('bindir'))) -conf.set_quoted('LIBDIR', - join_paths(get_option('prefix'), - get_option('libdir'))) -conf.set_quoted('DATADIR', - join_paths(get_option('prefix'), - get_option('datadir'))) -conf.set_quoted('LIBEXECDIR', - join_paths(get_option('prefix'), - get_option('libexecdir'))) -conf.set_quoted('LOCALSTATEDIR', - join_paths(get_option('prefix'), - get_option('localstatedir'))) - -cd_system_profiles_dir = join_paths(get_option('prefix'), - get_option('localstatedir'), +prefix = get_option('prefix') + +bindir = join_paths(prefix, get_option('bindir')) +libdir = join_paths(prefix, get_option('libdir')) +datadir = join_paths(prefix, get_option('datadir')) +libexecdir = join_paths(prefix, get_option('libexecdir')) +localstatedir = join_paths(prefix, get_option('localstatedir')) +sysconfdir = join_paths(prefix, get_option('sysconfdir')) +mandir = join_paths(prefix, get_option('mandir')) +includedir = join_paths(prefix, get_option('includedir')) + +conf.set_quoted('SYSCONFDIR', sysconfdir) +conf.set_quoted('BINDIR', bindir) +conf.set_quoted('LIBDIR', libdir) +conf.set_quoted('DATADIR', datadir) +conf.set_quoted('LIBEXECDIR', libexecdir) +conf.set_quoted('LOCALSTATEDIR', localstatedir) + +cd_system_profiles_dir = join_paths(localstatedir, 'lib', 'colord', 'icc') conf.set_quoted('CD_SYSTEM_PROFILES_DIR', cd_system_profiles_dir) @@ -233,9 +233,6 @@ configure_file( configuration : conf ) -localstatedir = join_paths(get_option('prefix'), - get_option('localstatedir')) - root_incdir = include_directories('.') subdir('lib') diff --git a/policy/meson.build b/policy/meson.build index df16e52..8880b23 100644 --- a/policy/meson.build +++ b/policy/meson.build @@ -12,7 +12,7 @@ if polkit.version().version_compare('>0.113') input: policy_in, output: 'org.freedesktop.color.policy', install: true, - install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions') , + install_dir: join_paths(datadir, 'polkit-1', 'actions') , type: 'xml', po_dir: join_paths(meson.source_root(), 'po') ) @@ -22,7 +22,7 @@ else input: policy_in, output: 'org.freedesktop.color.policy', install: true, - install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions') , + install_dir: join_paths(datadir, 'polkit-1', 'actions') , type: 'xml', data_dirs: join_paths(meson.source_root(), 'policy'), po_dir: join_paths(meson.source_root(), 'po') diff --git a/src/meson.build b/src/meson.build index 2b05a90..a3324ab 100644 --- a/src/meson.build +++ b/src/meson.build @@ -11,7 +11,7 @@ install_data([ 'org.freedesktop.ColorManager.Sensor.xml', 'org.freedesktop.ColorManager.Profile.xml', ], - install_dir : join_paths(get_option('datadir'), 'dbus-1', 'interfaces') + install_dir : join_paths(datadir, 'dbus-1', 'interfaces') ) resources_src = gnome.compile_resources( @@ -71,7 +71,7 @@ executable( cargs, ], install : true, - install_dir : get_option('libexecdir') + install_dir : libexecdir ) if get_option('enable-tests') diff --git a/src/plugins/meson.build b/src/plugins/meson.build index 0f623c8..80572bd 100644 --- a/src/plugins/meson.build +++ b/src/plugins/meson.build @@ -26,7 +26,7 @@ shared_module('colord_sensor_camera', src_incdir, ], install : true, - install_dir: join_paths(get_option('libdir'), 'colord-plugins'), + install_dir: join_paths(libdir, 'colord-plugins'), c_args : cargs, dependencies : [ gio, @@ -44,7 +44,7 @@ shared_module('colord_sensor_scanner', src_incdir, ], install : true, - install_dir: join_paths(get_option('libdir'), 'colord-plugins'), + install_dir: join_paths(libdir, 'colord-plugins'), c_args : cargs, dependencies : [ gio, @@ -63,10 +63,10 @@ if get_option('enable-sane') src_incdir, ], install : true, - install_dir: join_paths(get_option('libdir'), 'colord-plugins'), + install_dir: join_paths(libdir, 'colord-plugins'), c_args : [ cargs, - '-DCOLORD_SANE_BINARY="' + join_paths(get_option('libexecdir'), 'colord-sane' + '"'), + '-DCOLORD_SANE_BINARY="' + join_paths(libexecdir, 'colord-sane') + '"', ], dependencies : [ gio, diff --git a/src/sensors/argyll/meson.build b/src/sensors/argyll/meson.build index fb56f6a..51c8488 100644 --- a/src/sensors/argyll/meson.build +++ b/src/sensors/argyll/meson.build @@ -10,7 +10,7 @@ shared_module('colord_sensor_argyll', root_incdir, ], install : true, - install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + install_dir: join_paths(libdir, 'colord-sensors'), c_args : cargs, dependencies : [ gio, diff --git a/src/sensors/colorhug/meson.build b/src/sensors/colorhug/meson.build index 7c44e6d..86c1ea1 100644 --- a/src/sensors/colorhug/meson.build +++ b/src/sensors/colorhug/meson.build @@ -9,7 +9,7 @@ shared_module('colord_sensor_colorhug', root_incdir, ], install : true, - install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + install_dir: join_paths(libdir, 'colord-sensors'), c_args : cargs, link_with : colorhug, dependencies : [ diff --git a/src/sensors/dtp94/meson.build b/src/sensors/dtp94/meson.build index 7f0234d..ac72816 100644 --- a/src/sensors/dtp94/meson.build +++ b/src/sensors/dtp94/meson.build @@ -11,7 +11,7 @@ shared_module('colord_sensor_dtp94', root_incdir, ], install : true, - install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + install_dir: join_paths(libdir, 'colord-sensors'), c_args : cargs, dependencies : [ gio, diff --git a/src/sensors/dummy/meson.build b/src/sensors/dummy/meson.build index f1d34e9..7f985ed 100644 --- a/src/sensors/dummy/meson.build +++ b/src/sensors/dummy/meson.build @@ -9,7 +9,7 @@ shared_module('colord_sensor_dummy', root_incdir, ], install : true, - install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + install_dir: join_paths(libdir, 'colord-sensors'), c_args : cargs, dependencies : [ gio, diff --git a/src/sensors/huey/meson.build b/src/sensors/huey/meson.build index e8e2270..edb5f11 100644 --- a/src/sensors/huey/meson.build +++ b/src/sensors/huey/meson.build @@ -12,7 +12,7 @@ shared_module('colord_sensor_huey', root_incdir, ], install : true, - install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + install_dir: join_paths(libdir, 'colord-sensors'), c_args : cargs, dependencies : [ gio, diff --git a/src/sensors/spark/meson.build b/src/sensors/spark/meson.build index 52bfd39..40403fe 100644 --- a/src/sensors/spark/meson.build +++ b/src/sensors/spark/meson.build @@ -11,7 +11,7 @@ shared_module('colord_sensor_spark', root_incdir, ], install : true, - install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + install_dir: join_paths(libdir, 'colord-sensors'), c_args : cargs, dependencies : [ gio, |