mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: Fix up setting the bash completion dir

Browse source 
This makes setting up the bash completion dir consistent with the other
cases that we need to deal with, and also handles distcheck correctly.
This commit is contained in:
Arun Raghavan 2015-07-28 10:09:20 +05:30
parent 6a12d96233
commit 344770389e
2 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -113,4 +113,4 @@ $(top_srcdir)/.version:
DISTCLEANFILES = \ DISTCLEANFILES = \
po/.intltool-merge-cache po/.intltool-merge-cache
DISTCHECK_CONFIGURE_FLAGS = --with-udev-rules-dir="$$dc_install_base/lib/udev/rules.d" --with-systemduserunitdir="$$dc_install_base/lib/systemd/user" DISTCHECK_CONFIGURE_FLAGS = --with-udev-rules-dir="$$dc_install_base/lib/udev/rules.d" --with-systemduserunitdir="$$dc_install_base/lib/systemd/user" --with-bash-completion-dir="$$dc_install_base/share/bash-completion/completions"

17
configure.ac
View file

@ -1436,17 +1436,12 @@ AC_ARG_WITH(
AC_SUBST(udevrulesdir) AC_SUBST(udevrulesdir)
# PKG_CHECK_VAR available with pkg-config 0.28 AC_ARG_WITH([bash-completion-dir],
AC_DEFUN([PKG_CHECK_VAR], AS_HELP_STRING([--with-bash-completion-dir=DIR], [Directory for bash completion files]),
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl [bashcompletiondir=$withval], [bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)])
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl if test "x$bashcompletionsdir" = ""; then
_PKG_CONFIG([$1], [variable="][$3]["], [$2]) bashcompletiondir="${datadir}/bash-completion/completions"
AS_VAR_COPY([$1], [pkg_cv_][$1]) fi
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])
PKG_CHECK_VAR(bashcompletiondir, [bash-completion], [completionsdir], ,
bashcompletiondir="${sysconfdir}/bash_completion.d")
AC_SUBST(bashcompletiondir) AC_SUBST(bashcompletiondir)