Mercurial > hg > release > icedtea-web-1.1

changeset 167:d78bbff25267

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix DESTDIR issues in Makefile 2011-03-15 Omair Majid <omajid@redhat.com> * Makefile.am (LAUNCHER_BOOTCLASSPATH, PLUGIN_BOOTCLASSPATH) (javaws.desktop, itweb-settings.desktop): Remove DESTDIR.
author Omair Majid <omajid@redhat.com>
date Tue, 15 Mar 2011 10:22:27 -0400
parents 04459b8baed4
children 091c5e83d793
files ChangeLog Makefile.am
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Mar 11 09:48:55 2011 +0100
+++ b/ChangeLog	Tue Mar 15 10:22:27 2011 -0400
@@ -1,3 +1,8 @@
+2011-03-15  Omair Majid  <omajid@redhat.com>
+
+	* Makefile.am (LAUNCHER_BOOTCLASSPATH, PLUGIN_BOOTCLASSPATH)
+	(javaws.desktop, itweb-settings.desktop): Remove DESTDIR.
+
 2011-03-10  Mark Wielaard  <mark@klomp.org>
 
 	* tests/netx/pac/pac-funcs-test.js (testIsResolvable):
--- a/Makefile.am	Fri Mar 11 09:48:55 2011 +0100
+++ b/Makefile.am	Tue Mar 15 10:22:27 2011 -0400
@@ -25,8 +25,8 @@
 IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
 
 JRE='"$(SYSTEM_JDK_DIR)/jre"'
-LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
-PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
+LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
+PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
 
 # Fake update version to shut up the plugin detector hosted by Oracle.
 # If Oracle ever release a JDK update greater than 50, this needs to be increased.
@@ -334,10 +334,10 @@
 	fi
 
 javaws.desktop: javaws.desktop.in
-	sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < $(srcdir)/javaws.desktop.in > javaws.desktop
+	sed "s#PATH_TO_JAVAWS#$(bindir)/javaws#" < $(srcdir)/javaws.desktop.in > javaws.desktop
 
 itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
-	sed "s#PATH_TO_ITWEB_SETTINGS#$(DESTDIR)$(bindir)/itweb-settings#" \
+	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/itweb-settings#" \
 	  < $(srcdir)/itweb-settings.desktop.in > itweb-settings.desktop
 
 # documentation