[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - configure.ac
Arkadiusz MiÅkiewicz
arekm at maven.pl
Fri Oct 10 09:28:21 PDT 2014
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 63ec7252a4c64b98a07408106d6d8054dde8710d
Author: Arkadiusz MiÅkiewicz <arekm at maven.pl>
Date: Thu Oct 9 23:40:29 2014 +0200
Avoid bashizm in AbsolutePath() function
&> is another bashizm. Avoid that since configure is run using POSIX
shell. Some POSIX compatible shells like mksh do not understand bash
syntax.
"cd - &> /dev/null" was causing "cd -" command to go into background
which means we never changed back to original directory thus fooling
configure script later:
config.status: error: cannot find input file: `config_host.mk.in'
"&>" was also redirecting stderr which we don't want to do anymore since
it hides real and interesting errors.
Change-Id: I286a32e6a200afca883b159d9196f606e0fe7063
Reviewed-on: https://gerrit.libreoffice.org/11896
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
(cherry picked from commit d5b0697cebd7d66ee90d12f7b893c193ae36eaa6)
Reviewed-on: https://gerrit.libreoffice.org/11897
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/configure.ac b/configure.ac
index 331a1ee..74211a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ AbsolutePath()
if test -d "$rel" ; then
cd "$rel" || AC_MSG_ERROR([absolute path resolution failed for "$rel".])
absolute_path="$(pwd)"
- cd - &> /dev/null
+ cd - > /dev/null
else
AC_MSG_ERROR([Failed to resolve absolute path. "$rel" does not exist or is not a directory.])
fi
More information about the Libreoffice-commits
mailing list