/hg/icedtea6: Fix quoting of ICEDTEA_NAME ICEDTEA_REV ICEDTEA_PKG

[doko at icedtea.classpath.org]

changeset a6503bfb7390 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a6503bfb7390
author: doko at ubuntu.com
date: Wed Jan 27 13:16:02 2010 +0100

	Fix quoting of ICEDTEA_NAME ICEDTEA_REV ICEDTEA_PKG

	If these macros need quoting, quoting has to be done in the places
	where it is needed, else PLUGIN_VERSION gets wrong.

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

	 * Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV
	ICEDTEA_PKG.


diffstat:

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

diffs (36 lines):

diff -r a82258f09fae -r a6503bfb7390 ChangeLog
--- a/ChangeLog	Tue Jan 26 19:45:53 2010 +0000
+++ b/ChangeLog	Wed Jan 27 13:16:02 2010 +0100
@@ -1,3 +1,7 @@ 2010-01-25 Andrew John Hughes  <ahughes@
+2010-01-27  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV ICEDTEA_PKG.
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r a82258f09fae -r a6503bfb7390 Makefile.am
--- a/Makefile.am	Tue Jan 26 19:45:53 2010 +0000
+++ b/Makefile.am	Wed Jan 27 13:16:02 2010 +0100
@@ -385,15 +385,15 @@ JDK_UPDATE_VERSION = $(shell echo $(OPEN
 JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-ICEDTEA_NAME="IcedTea6"
+ICEDTEA_NAME = IcedTea6
 if HAS_ICEDTEA_REVISION
-ICEDTEA_REV="+${ICEDTEA_REVISION}"
+ICEDTEA_REV = +${ICEDTEA_REVISION}
 endif
 if HAS_PKGVERSION
-ICEDTEA_PKG=" (${PKGVERSION})"
-endif
-
-PLUGIN_VERSION=$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
+ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
+endif
+
+PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
 
 ICEDTEA_ENV = \
 	IMPORT_BINARY_PLUGS=true \