Skip to content

Commit

Permalink
Merge r155515 - Unquoted $ORIGDIR in autogen.sh
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=19512

Reviewed by Carlos Garcia Campos.

Quote all directory names. This doesn't mean that all possible
directory names are safe for building webkit, but the configure
script already runs a sanity check.

* autogen.sh:
  • Loading branch information
bertogg authored and carlosgcampos committed Sep 16, 2013
1 parent 68dc8dd commit 777a7a0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
13 changes: 13 additions & 0 deletions ChangeLog
@@ -1,3 +1,16 @@
2013-09-11 Alberto Garcia <berto@igalia.com>

Unquoted $ORIGDIR in autogen.sh
https://bugs.webkit.org/show_bug.cgi?id=19512

Reviewed by Carlos Garcia Campos.

Quote all directory names. This doesn't mean that all possible
directory names are safe for building webkit, but the configure
script already runs a sanity check.

* autogen.sh:

2013-09-11 Zan Dobersek <zdobersek@igalia.com>

[GTK] Stop disabling deprecated symbols in debug builds
Expand Down
8 changes: 4 additions & 4 deletions autogen.sh
Expand Up @@ -2,11 +2,11 @@

# Allow invocation from a separate build directory; in that case, we change
# to the source directory to run the auto*, then change back before running configure
srcdir=`dirname $0`
srcdir=`dirname "$0"`
test -z "$srcdir" && srcdir=.

ORIGDIR=`pwd`
cd $srcdir
cd "$srcdir" || exit 1

rm -f $top_srcdir/autom4te.cache

Expand All @@ -18,9 +18,9 @@ if test -z `which autoreconf`; then
fi
autoreconf --verbose --install -I Source/autotools $ACLOCAL_FLAGS|| exit $?

cd $ORIGDIR || exit 1
cd "$ORIGDIR" || exit 1

if test -z "$NOCONFIGURE"; then
$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
"$srcdir"/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
fi

0 comments on commit 777a7a0

Please sign in to comment.