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

[doko at ubuntu.com]

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

	        * Makefile.am: Revert the previous change. Always pass DISTRIBUTION_ID
	        instead.
	        * configure.ac: Make DIST_ID more precise.

diffstat:

3 files changed, 14 insertions(+), 8 deletions(-)
ChangeLog    |    6 ++++++
Makefile.am  |    5 ++---
configure.ac |   11 ++++++-----

diffs (50 lines):

diff -r e86a02a1a217 -r d47e55fa18e5 ChangeLog
--- a/ChangeLog	Wed Oct 22 12:20:12 2008 -0400
+++ b/ChangeLog	Wed Oct 22 19:18:26 2008 +0200
@@ -1,3 +1,9 @@ 2008-10-22  Omair Majid  <omajid at redhat.
+2008-10-22  Matthias Klose  <doko at ubuntu.com>
+
+        * Makefile.am: Revert the previous change. Always pass DISTRIBUTION_ID
+        instead.
+        * configure.ac: Make DIST_ID more precise.
+
 2008-10-22  Omair Majid  <omajid at redhat.com>
 
 	* rt/net/sourceforge/nanoxml/XMLElement.java 
diff -r e86a02a1a217 -r d47e55fa18e5 Makefile.am
--- a/Makefile.am	Wed Oct 22 12:20:12 2008 -0400
+++ b/Makefile.am	Wed Oct 22 19:18:26 2008 +0200
@@ -171,9 +171,8 @@ ICEDTEA_ENV = \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
 	"JAVAC=" \
-	"RHINO_JAR=$(RHINO_JAR)"
-
-ICEDTEA_ENV += $(if $(DIST_ID),"DISTRIBUTION_ID="$(DIST_ID)"")
+	"RHINO_JAR=$(RHINO_JAR)" \
+	"DISTRIBUTION_ID=$(DIST_ID)"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
diff -r e86a02a1a217 -r d47e55fa18e5 configure.ac
--- a/configure.ac	Wed Oct 22 12:20:12 2008 -0400
+++ b/configure.ac	Wed Oct 22 19:18:26 2008 +0200
@@ -237,12 +237,13 @@ AC_SUBST(PKGVERSION)
 AC_SUBST(PKGVERSION)
 
 if test -n "$LSB_RELEASE"; then
-  DIST_ID=$($LSB_RELEASE -ds)
+  if test -n "$PKGVERSION"; then
+    DIST_ID="$DIST_ID, package $PKGVERSION"
+  else
+    DIST_ID="Built on $($LSB_RELEASE -ds)"
+  fi
 else
-  DIST_ID='Custom build'
-fi
-if test -n "$PKGVERSION"; then
-  DIST_ID="$DIST_ID, package $PKGVERSION"
+  DIST_ID="Custom build ($(date))"
 fi
 AC_SUBST(DIST_ID)