The mixer paths are not available in ${builddir} - we need to look in
${srcdir}. This should fix running an in-tree build without make install
as well as alsa-mixer-path-test in make distcheck.
Since the most straightforward way to define PA_SRCDIR was in
Makefile.am, I'm moving PA_BUILDDIR there as well for consistency.
---
configure.ac | 2 --
src/Makefile.am | 4 +++-
src/modules/alsa/alsa-mixer.c | 2 +-
src/tests/alsa-mixer-path-test.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 43d3b44..6a45c12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1239,8 +1239,6 @@ AC_SUBST(PA_SOEXT, [.so])
AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"])
AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files])
-AC_DEFINE_UNQUOTED(PA_BUILDDIR, "${ac_pwd}/src", [Location of uninstalled binaries])
-
#### Mac OSX specific stuff #####
AC_ARG_ENABLE(mac-universal,
diff --git a/src/Makefile.am b/src/Makefile.am
index 4b3efa3..a621a30 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,9 @@ AM_CPPFLAGS = \
-DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
-DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
AM_CFLAGS = \
- $(PTHREAD_CFLAGS)
+ $(PTHREAD_CFLAGS) \
+ -DPA_SRCDIR=\"$(abs_srcdir)\" \
+ -DPA_BUILDDIR=\"$(abs_builddir)\"
AM_CXXFLAGS = $(AM_CFLAGS)
SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index b65baeb..554a57d 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -2373,7 +2373,7 @@ static int path_verify(pa_alsa_path *p) {
static const char *get_default_paths_dir(void) {
if (pa_run_from_build_tree())
- return PA_BUILDDIR "/modules/alsa/mixer/paths/";
+ return PA_SRCDIR "/modules/alsa/mixer/paths/";
else
return PA_ALSA_PATHS_DIR;
}
diff --git a/src/tests/alsa-mixer-path-test.c b/src/tests/alsa-mixer-path-test.c
index 1ad06ee..f2bc4cb 100644
--- a/src/tests/alsa-mixer-path-test.c
+++ b/src/tests/alsa-mixer-path-test.c
@@ -16,7 +16,7 @@
/* This function was copied from alsa-mixer.c */
static const char *get_default_paths_dir(void) {
if (pa_run_from_build_tree())
- return PA_BUILDDIR "/modules/alsa/mixer/paths/";
+ return PA_SRCDIR "/modules/alsa/mixer/paths/";
else
return PA_ALSA_PATHS_DIR;
}
--
1.8.1.2
