/hg/release/icedtea6-1.7: Don't hide errors in statement sequenc...

[doko at icedtea.classpath.org]

changeset 1e6c98cc8858 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=1e6c98cc8858
author: doko at ubuntu.com
date: Thu Jan 21 16:22:30 2010 +0100

	Don't hide errors in statement sequences building the NPPlugin

	2010-01-21 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am: Don't hide errors in statement sequences
	building the NPPlugin. Use ICEDTEA_REV to defined
	PLUGIN_VERSION.


diffstat:

2 files changed, 10 insertions(+), 12 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |   17 +++++------------

diffs (52 lines):

diff -r 3469e88d33ea -r 1e6c98cc8858 ChangeLog
--- a/ChangeLog	Thu Jan 21 02:23:36 2010 +0000
+++ b/ChangeLog	Thu Jan 21 16:22:30 2010 +0100
@@ -1,3 +1,8 @@ 2010-01-21  Andrew John Hughes  <ahughes
+2010-01-21  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Don't hide errors in statement sequences building
+	the NPPlugin. Use ICEDTEA_REV to defined PLUGIN_VERSION.
+
 2010-01-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 3469e88d33ea -r 1e6c98cc8858 Makefile.am
--- a/Makefile.am	Thu Jan 21 02:23:36 2010 +0000
+++ b/Makefile.am	Thu Jan 21 16:22:30 2010 +0100
@@ -1478,31 +1478,24 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
 		IcedTeaPluginUtils.o
 
 $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS)): $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_SRC))
-	cd $(NPPLUGIN_DIR); \
-	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
-	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
-	fi ; \
-	if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \
-	plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \
+	cd $(NPPLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
-	  -DPLUGIN_VERSION="\"$$plugin_version\"" \
+	  -DPLUGIN_VERSION="\"$(PACKAGE_VERSION)$(ICEDTEA_REV)\"" \
 	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
 	  $(GLIB_CFLAGS) \
 	  $(GTK_CFLAGS) \
 	  $(MOZILLA_CFLAGS) \
-	  -fPIC -c $(NPPLUGIN_SRC); \
-	cd ../
+	  -fPIC -c $(NPPLUGIN_SRC)
 
 $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so: $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS))
-	cd $(NPPLUGIN_DIR); \
+	cd $(NPPLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
 	  $(NPPLUGIN_OBJECTS) \
 	  $(GLIB_LIBS) \
 	  $(GTK_LIBS) \
 	  $(MOZILLA_LIBS)\
-	  -shared -o $@; \
-	cd ../
+	  -shared -o $@
 
 stamps/icedtea-npplugin: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
 	touch stamps/icedtea-npplugin