Mercurial > hg > release > icedtea7-2.0

changeset 2156:fdf0c004a607

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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@ubuntu.com> * Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV ICEDTEA_PKG.
author doko@ubuntu.com
date Wed, 27 Jan 2010 13:16:02 +0100
parents a162d147953c
children 962e6e2b70f5
files ChangeLog Makefile.am
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 25 21:52:19 2010 +0000
+++ b/ChangeLog	Wed Jan 27 13:16:02 2010 +0100
@@ -1,3 +1,7 @@
+2010-01-27  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV ICEDTEA_PKG.
+
 2010-01-25 Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Jan 25 21:52:19 2010 +0000
+++ b/Makefile.am	Wed Jan 27 13:16:02 2010 +0100
@@ -456,15 +456,15 @@
 JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-ICEDTEA_NAME="IcedTea7"
+ICEDTEA_NAME = IcedTea7
 if HAS_ICEDTEA_REVISION
-ICEDTEA_REV="+${ICEDTEA_REVISION}"
+ICEDTEA_REV = +${ICEDTEA_REVISION}
 endif
 if HAS_PKGVERSION
-ICEDTEA_PKG=" (${PKGVERSION})"
+ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
 endif
 
-PLUGIN_VERSION=$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
+PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
 
 ICEDTEA_ENV = \
 	ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \