changeset 21564:87fc55416513

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.
author Mike Miller <mtmiller@octave.org>
date Wed, 30 Mar 2016 16:57:21 -0700
parents 1fc6ae99c792
children 08baf0ebc9a9
files etc/icons/octave.desktop.in etc/module.mk
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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 $@