diff options
| author | Alexander Tsoy <alexander@tsoy.me> | 2014-10-27 16:45:10 +0300 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2014-11-07 10:10:41 +0100 |
| commit | b05ab0eaebd9e6e58f1b9c092e05323c5b901a2b (patch) | |
| tree | 0cb7987e4d6d97cbd7eb3c723a5e800ce734c313 | |
| parent | e402ed1fe465d7744c3a7aea7c212a3c0d4878f1 (diff) | |
| download | gnome-shell-b05ab0eaebd9e6e58f1b9c092e05323c5b901a2b.tar.gz | |
build: Workaround quoting issues in configure script
Default value of BROWSER_PLUGIN_DIR variable contains special symbols.
Thus quoting and inlining it in parameter expansion is not portable.
In particular it does not work in dash. Replace ${a:-b} parameter
expansion with conditional statement.
https://bugzilla.gnome.org/show_bug.cgi?id=739241
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d55848b7b..5b8c306ba 100644 --- a/configure.ac +++ b/configure.ac @@ -232,7 +232,9 @@ esac AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS" AC_SUBST(AM_CFLAGS) -BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}" +if test -z "${BROWSER_PLUGIN_DIR}"; then + BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins" +fi AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to]) AC_CONFIG_FILES([ |