Title: [146686] trunk/Source/WebKit/gtk
- Revision
- 146686
- Author
- [email protected]
- Date
- 2013-03-22 17:10:39 -0700 (Fri, 22 Mar 2013)
Log Message
Trivial fixes to the gyp-build autogen.sh script.
Reviewed by Martin Robinson (mrobinson).
* gyp/autogen.sh: add /bin/sh -e as hashbang, so stricter shells will be happy to
run the script; deal with automake exiting with an error code because there is no
Makefile.am for it to work on.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (146685 => 146686)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-03-23 00:00:28 UTC (rev 146685)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-03-23 00:10:39 UTC (rev 146686)
@@ -1,3 +1,13 @@
+2013-03-22 Gustavo Noronha Silva <[email protected]>
+
+ Trivial fixes to the gyp-build autogen.sh script.
+
+ Reviewed by Martin Robinson (mrobinson).
+
+ * gyp/autogen.sh: add /bin/sh -e as hashbang, so stricter shells will be happy to
+ run the script; deal with automake exiting with an error code because there is no
+ Makefile.am for it to work on.
+
2013-03-19 Martin Robinson <[email protected]>
[GTK] Add support for building the WebCore bindings to the gyp build
Modified: trunk/Source/WebKit/gtk/gyp/autogen.sh (146685 => 146686)
--- trunk/Source/WebKit/gtk/gyp/autogen.sh 2013-03-23 00:00:28 UTC (rev 146685)
+++ trunk/Source/WebKit/gtk/gyp/autogen.sh 2013-03-23 00:10:39 UTC (rev 146686)
@@ -1,3 +1,5 @@
+#!/bin/sh -e
+
export SCRIPT_DIRECTORY=`dirname $0`
export TOPLEVEL_DIRECTORY="$SCRIPT_DIRECTORY/../../../.."
@@ -35,7 +37,7 @@
# Automake is bizarrely responsible for copying some of the files necessary
# for configure to run to the macros directory. So we invoke it here and hide
# the warnings we get about not using automake in configure.ac.
-automake --add-missing --copy > /dev/null 2>&1
+automake --add-missing --copy > /dev/null 2>&1 || true
if test -z "$NOCONFIGURE"; then
./configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
