/hg/icedtea-web: Also javaws.png icon is being installed in make...

[jvanek at icedtea.classpath.org]

changeset c2470c99438b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c2470c99438b
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Feb 06 13:30:11 2015 +0100

	Also javaws.png icon is being installed in make install.

	Makefile.am: declared ICONS_DEST_DIR with value pointing to icons dir (install-exec-local) ICONS_DEST_DIR added to list of created directories javaws.png installed into ICONS_DEST_DIR. (uninstall-local) javaws.png removed from ICONS_DEST_DIR.


diffstat:

 ChangeLog   |  8 ++++++++
 Makefile.am |  5 ++++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diffs (50 lines):

diff -r 18c8153c5816 -r c2470c99438b ChangeLog
--- a/ChangeLog	Mon Feb 02 10:42:12 2015 -0500
+++ b/ChangeLog	Fri Feb 06 13:30:11 2015 +0100
@@ -1,3 +1,11 @@
+2014-02-06  Jiri Vanek  <jvanek at redhat.com>
+
+	Also javaws.png icon is being installed in make install.
+	* Makefile.am: declared ICONS_DEST_DIR with value pointing to icons dir
+	(install-exec-local) ICONS_DEST_DIR added to list of created directories
+	javaws.png installed into ICONS_DEST_DIR. (uninstall-local) javaws.png
+	removed from ICONS_DEST_DIR.
+
 2015-02-02  Omair Majid  <omajid at redhat.com>
 
 	* configure.ac: Search for hamcrest jar.
diff -r 18c8153c5816 -r c2470c99438b Makefile.am
--- a/Makefile.am	Mon Feb 02 10:42:12 2015 -0500
+++ b/Makefile.am	Fri Feb 06 13:30:11 2015 +0100
@@ -6,6 +6,7 @@
 export DOCS_DIR=$(TOP_BUILD_DIR)/icedtea-web-docs/$(FULL_VERSION)
 export NETX_SRCDIR = $(abs_top_srcdir)/netx
 export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
+export ICONS_DEST_DIR=$(DESTDIR)$(datadir)/pixmaps
 
 export REPORT_STYLES_DIRNAME=report-styles
 
@@ -267,13 +268,14 @@
  clean-junit-runner clean-netx-unit-tests
 
 install-exec-local:
-	${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir)
+	${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) $(ICONS_DEST_DIR)
 if ENABLE_PLUGIN
 	${INSTALL_PROGRAM} $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) $(DESTDIR)$(libdir)
 	${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
 endif
 	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
 	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
+	${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/
 	${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
@@ -304,6 +306,7 @@
 	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
 	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
 	rm -r $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
+	rm -r $(ICONS_DEST_DIR)/javaws.png
 	KNOWN_MANS="icedtea-web.1  icedtea-web-plugin.1  itweb-settings.1  javaws.1  policyeditor.1" ; \
 	KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
 	for file in $$KNOWN_MANS ; do \