diff options
| author | Arnaud Rebillout <arnaud.rebillout@collabora.com> | 2018-11-26 14:11:47 +0700 |
|---|---|---|
| committer | Arun Raghavan <arun@arunraghavan.net> | 2019-06-08 11:57:00 +0200 |
| commit | 8146f87808b4b4f9cca1e1558fbfa344fd53d013 (patch) | |
| tree | 3a9ad2d0b4a32b0260588e34883a704dccde941b | |
| parent | 8f336ede123434ec84edd64c43bfacab76db6298 (diff) | |
| download | pulseaudio-8146f87808b4b4f9cca1e1558fbfa344fd53d013.tar.gz | |
meson: Fix various install scripts
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
| -rw-r--r-- | man/meson.build | 6 | ||||
| -rw-r--r-- | shell-completion/bash/meson.build | 3 | ||||
| -rwxr-xr-x | src/modules/gsettings/post-install.sh | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/man/meson.build b/man/meson.build index edf9c709..10438445 100644 --- a/man/meson.build +++ b/man/meson.build @@ -54,9 +54,11 @@ foreach tuple : manpages install_dir : mandirn, ) - foreach alias : aliases + foreach alias_stem : aliases + alias = alias_stem + '.' + section dst = join_paths(mandirn, alias) - meson.add_install_script('ln', '-fs', man, dst) + cmd = 'ln -fs @0@ $DESTDIR@1@'.format(man, dst) + meson.add_install_script('sh', '-c', cmd) endforeach if xmllint.found() diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index 443049bd..b5b00f1b 100644 --- a/shell-completion/bash/meson.build +++ b/shell-completion/bash/meson.build @@ -13,5 +13,6 @@ install_data('pulseaudio', install_dir : bashcompletiondir) foreach alias : aliases dst = join_paths(bashcompletiondir, alias) - meson.add_install_script('ln', '-fs', 'pulseaudio', dst) + cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pulseaudio', dst) + meson.add_install_script('sh', '-c', cmd) endforeach diff --git a/src/modules/gsettings/post-install.sh b/src/modules/gsettings/post-install.sh index 02620467..cec8b934 100755 --- a/src/modules/gsettings/post-install.sh +++ b/src/modules/gsettings/post-install.sh @@ -5,5 +5,8 @@ set -u DATADIR="$1" +# Package managers set this so we don't need to run +if [ "${DESTDIR:-}" ]; then exit 0; fi + echo "Compiling GSettings schemas..." glib-compile-schemas "$DATADIR/glib-2.0/schemas" |