summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2018-05-11 14:06:21 +0300
committerTanu Kaskinen <tanuk@iki.fi>2018-05-11 14:28:14 +0300
commitd25387454a8aafa9cde0de17d8792e58e95722ef (patch)
tree0eae4916e68dc89b1a2642f513099f41288144b6
parent0ee9d654673ac40691208b5aace52d9a4b69d822 (diff)
downloadpulseaudio-d25387454a8aafa9cde0de17d8792e58e95722ef.tar.gz
build-sys: fix distribution of GSettings files
dist_gsettingsdataconvert_DATA was set only if GSettings was enabled. If the developer that generates the tarball doesn't have GSettings enabled, pulseaudio.convert wouldn't get included in the tarball. The schema file was not being added to the tarball even if GSettings was enabled.
-rw-r--r--src/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ef9eb252..e77624f6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,7 +109,9 @@ EXTRA_DIST = \
daemon/pulseaudio.desktop.in \
map-file \
daemon/pulseaudio-system.conf \
- modules/echo-cancel/adrian-license.txt
+ modules/echo-cancel/adrian-license.txt \
+ modules/gsettings/org.freedesktop.pulseaudio.gschema.xml \
+ modules/gsettings/pulseaudio.convert
pulseconf_DATA = \
default.pa \
@@ -1422,7 +1424,7 @@ modlibexec_LTLIBRARIES += \
pulselibexec_PROGRAMS += \
gsettings-helper
-dist_gsettingsdataconvert_DATA = \
+gsettingsdataconvert_DATA = \
modules/gsettings/pulseaudio.convert
endif