diff options
| author | Omair Majid <[email protected]> | 2011-03-15 10:22:27 -0400 |
|---|---|---|
| committer | Omair Majid <[email protected]> | 2011-03-15 10:22:27 -0400 |
| commit | 20e7ad77b70507d5f53ef945147751a7e41e86fe (patch) | |
| tree | 66b3ef300c6b39e47ad8016732a63786575609ef | |
| parent | 99f114f202199679414d5e02041c6cd2f38facc8 (diff) | |
Fix DESTDIR issues in Makefile
2011-03-15 Omair Majid <[email protected]>
* Makefile.am (LAUNCHER_BOOTCLASSPATH, PLUGIN_BOOTCLASSPATH)
(javaws.desktop, itweb-settings.desktop): Remove DESTDIR.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2011-03-15 Omair Majid <[email protected]> + + * Makefile.am (LAUNCHER_BOOTCLASSPATH, PLUGIN_BOOTCLASSPATH) + (javaws.desktop, itweb-settings.desktop): Remove DESTDIR. + 2011-03-10 Mark Wielaard <[email protected]> * tests/netx/pac/pac-funcs-test.js (testIsResolvable): diff --git a/Makefile.am b/Makefile.am index 30a7dd1..fe98a32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,8 +25,8 @@ IT_CLASS_TARGET_VERSION=6 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 @@ clean-launchers: 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 |