diff options
| author | Dylan Van Assche <me@dylanvanassche.be> | 2022-12-30 15:52:46 +0100 |
|---|---|---|
| committer | Dylan Van Assche <dylan.vanassche@ugent.be> | 2023-01-20 16:24:53 +0100 |
| commit | 8e1d14c9d19fcd7f82285c4d7cad4737d239aa04 (patch) | |
| tree | 75abe9f4ccd21b5d326ee1314422c02f6d4c9e44 | |
| parent | f73e023b8fadd46f2de21c5086d7fbea0e8d0d53 (diff) | |
| download | geoclue-8e1d14c9d19fcd7f82285c4d7cad4737d239aa04.tar.gz | |
meson: install conf.d directory
Bump to meson 0.60.0 for install_emptydir support
to install conf.d directory.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | data/meson.build | 3 | ||||
| -rw-r--r-- | meson.build | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7a15cb..fc68178 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ before_script: - apt-get install --yes libnotify-dev xsltproc gtk-doc-tools python3-pip - apt-get install --yes ninja-build gettext modemmanager-dev - DEBIAN_FRONTEND=noninteractive apt-get install --yes libsoup-3.0 - - pip3 install meson==0.53.2 + - pip3 install meson==0.60.0 # Ubuntu 14.04 is not supported, see README for details # diff --git a/data/meson.build b/data/meson.build index fc8dac5..9c39602 100644 --- a/data/meson.build +++ b/data/meson.build @@ -19,6 +19,9 @@ if get_option('enable-backend') conf.set('dbus_srv_user', get_option('dbus-srv-user')) conf.set('sysconfdir', sysconfdir) + confd_dir = join_paths(conf_dir, 'conf.d') + install_emptydir(confd_dir) + service_dir = join_paths(datadir, 'dbus-1', 'system-services') configure_file(output: 'org.freedesktop.GeoClue2.service', input: 'org.freedesktop.GeoClue2.service.in', diff --git a/meson.build b/meson.build index 8aa5c31..b654958 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('geoclue', 'c', version: '2.6.0', meson_version : '>= 0.47.2') +project('geoclue', 'c', version: '2.6.0', meson_version : '>= 0.60.0') gclue_version = meson.project_version() ver_arr = gclue_version.split('.') |