# HG changeset patch
# User Mike Miller <mtmiller@octave.org>
# Date 1459382241 25200
# Node ID 87fc55416513d1972481ddb1984259377ebbba4f
# Parent  1fc6ae99c7921e38b300df3f0e41c9fd9ad3e3dc
Use icon basename in octave.desktop for standards compliance (bug #47577)

* octave.desktop.in (Icon): Set to the basename of the installed icons.
* etc/module.mk (etc/icons/octave.desktop): Drop OCTAVE_IMAGEDIR from the
list of substitutions.

diff -r 1fc6ae99c792 -r 87fc55416513 etc/icons/octave.desktop.in
--- a/etc/icons/octave.desktop.in	Wed Mar 30 15:34:05 2016 -0700
+++ b/etc/icons/octave.desktop.in	Wed Mar 30 16:57:21 2016 -0700
@@ -3,7 +3,7 @@
 Comment=Scientific Computing using GNU Octave
 TryExec=%OCTAVE_PREFIX%/bin/octave
 Exec=%OCTAVE_PREFIX%/bin/octave --force-gui %f
-Icon=%OCTAVE_IMAGEDIR%/octave-logo.svg
+Icon=octave
 Terminal=false
 Type=Application
 Categories=Education;Science;Math;
diff -r 1fc6ae99c792 -r 87fc55416513 etc/module.mk
--- a/etc/module.mk	Wed Mar 30 15:34:05 2016 -0700
+++ b/etc/module.mk	Wed Mar 30 16:57:21 2016 -0700
@@ -79,7 +79,6 @@
 etc/icons/octave.desktop: etc/icons/octave.desktop.in | etc/icons/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	$(SED) < $< > $@-t \
-	  -e "s|%OCTAVE_IMAGEDIR%|${imagedir}|" \
 	  -e "s|%OCTAVE_PREFIX%|${prefix}|" && \
 	mv $@-t $@