[icedtea-web] RFC: fix DESTDIR issues in Makefile

[Dr Andrew John Hughes]

On 13:45 Mon 14 Mar     , Omair Majid wrote:
> Hi
> 
> The attached patch fixes some incorrect uses of DESTDIR in Makefile.am. 
> Following the advice from the GNU DESTDIR docs [1], I have removed all 
> uses of DESTDIR that aren't in the install* and uninstall* targets.
> 
> ChangeLog:
> 
> 2011-03-14  Omair Majid  <omajid at redhat.com>
> 
>      * Makefile.am (LAUNCHER_BOOTCLASSPATH, PLUGIN_BOOTCLASSPATH)
>      (javaws.desktop, itweb-settings.desktop): Remove DESTDIR.
> 
> 
> Any thoughts or comments?
> 
> Cheers,
> Omair
> 
> [1] http://www.gnu.org/prep/standards/html_node/DESTDIR.html#DESTDIR

Looks fine.  How did these get here in the first place? 
I thought I'd mentioned this at review time.

> diff -r 04459b8baed4 Makefile.am
> --- a/Makefile.am	Fri Mar 11 09:48:55 2011 +0100
> +++ b/Makefile.am	Mon Mar 14 13:32:34 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


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37