Mercurial > hg > release > icedtea6-1.8

changeset 1854:4e7e38a0c858

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 27 Jan 2010 15:38:20 +0000
parents 80b2080f8c91 (current diff) a6503bfb7390 (diff)
children afb79ce1f80e
files ChangeLog Makefile.am
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jan 27 15:35:17 2010 +0000
+++ b/ChangeLog	Wed Jan 27 15:38:20 2010 +0000
@@ -1,10 +1,15 @@
+2010-01-27  Matthias Klose  <doko@ubuntu.com>
+	
+	* Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV
+	ICEDTEA_PKG.
+
 2010-01-26 Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	(stamps/plugin-tests.stamp): Add
 	a target for building the plugin tests.
 	(plugin-tests): Alias for the above.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes@redhat.com>
 
 	* acinclude.m4:
--- a/Makefile.am	Wed Jan 27 15:35:17 2010 +0000
+++ b/Makefile.am	Wed Jan 27 15:38:20 2010 +0000
@@ -389,15 +389,15 @@
 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})"
+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 = \
 	IMPORT_BINARY_PLUGS=true \