changeset in /hg/icedtea6: 2008-10-18 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 3e76a22e6d6f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3e76a22e6d6f
description:
	2008-10-18  Matthias Klose  <doko at ubuntu.com>

	        * Makefile.am (stamps/patch.stamp): Fail if patches don't apply,
	        call $(HG) only if it exists.

diffstat:

2 files changed, 7 insertions(+), 2 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    4 ++--

diffs (27 lines):

diff -r c259572f3e31 -r 3e76a22e6d6f ChangeLog
--- a/ChangeLog	Fri Oct 17 17:08:45 2008 -0400
+++ b/ChangeLog	Sat Oct 18 11:26:20 2008 +0200
@@ -1,3 +1,8 @@ 2008-10-17  Deepak Bhole  <dbhole at redhat
+2008-10-18  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (stamps/patch.stamp): Fail if patches don't apply,
+	call $(HG) only if it exists.
+
 2008-10-17  Deepak Bhole  <dbhole at redhat.com>
 
 	* plugin/icedtea/sun/applet/PluginAppletViewer.java: Re-encode <, > and &
diff -r c259572f3e31 -r 3e76a22e6d6f Makefile.am
--- a/Makefile.am	Fri Oct 17 17:08:45 2008 -0400
+++ b/Makefile.am	Sat Oct 18 11:26:20 2008 +0200
@@ -628,9 +628,9 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 	if ! test x$${all_patches_ok} = "xyes"; then \
 	  echo ERROR patch $${all_patches_ok} FAILED! ; \
 	  echo WARNING make clean-patch before retrying a fix ; \
-	  false; \
+	  exit 2; \
 	fi ; \
-	if [ -e $(abs_top_srcdir)/.hg ]; then \
+	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
 	  revision="-r`(cd $(srcdir); $(HG) tip --template '{rev}')`" ; \
 	fi ; \
 	icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \