mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 19:42:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "build: fix make distcheck."

Browse source 
This reverts commit 462727d6d8.

This "fix" broke the build on Windows, where both prefix and datadir are
absolute paths and as such we would concatenate two absolute paths and fail.
This commit is contained in:
Sebastian Dröge 2015-11-26 22:42:45 +05:30
parent 5bcb7be179
commit c37da5d89c
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -178,15 +178,9 @@ AC_ARG_WITH([bash-completion-dir],
[with_bash_completion_dir=yes]) [with_bash_completion_dir=yes])
if test "x$with_bash_completion_dir" = "xyes"; then if test "x$with_bash_completion_dir" = "xyes"; then
if test "x$prefix" = xNONE; then PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [BASH_COMPLETION_DIR="`pkg-config --variable=completionsdir bash-completion`"],
[BASH_COMPLETION_DIR="`pkg-config --variable=completionsdir bash-completion`"], [BASH_COMPLETION_DIR="$datadir/bash-completion/completions"])
[BASH_COMPLETION_DIR="$datadir/bash-completion/completions"])
else
PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
[BASH_COMPLETION_DIR="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`"],
[BASH_COMPLETION_DIR="$prefix/$datadir/bash-completion/completions"])
fi
else else
BASH_COMPLETION_DIR="$with_bash_completion_dir" BASH_COMPLETION_DIR="$with_bash_completion_dir"
fi fi