Mercurial > octave-nkf

changeset 11657:6c413446e087 release-3-0-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore errors installing octave.desktop file
author John W. Eaton <jwe@octave.org>
date Thu, 21 Feb 2008 04:34:43 -0500
parents 86bf8c2c3fc1
children db22340e1f24
files ChangeLog examples/Makefile.in
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 21 04:30:27 2008 -0500
+++ b/ChangeLog	Thu Feb 21 04:34:43 2008 -0500
@@ -1,3 +1,8 @@
+2008-02-21  John W. Eaton  <jwe@octave.org>
+
+	* examples/Makefile.in (install install-strip): Ignore errors
+	installing octave.desktop file.
+
 2008-02-15  John W. Eaton  <jwe@octave.org>
 
 	* configure.in (*-*-freebsd*, *-*-openbsd*): Don't set SH_LD.
--- a/examples/Makefile.in	Thu Feb 21 04:30:27 2008 -0500
+++ b/examples/Makefile.in	Thu Feb 21 04:34:43 2008 -0500
@@ -95,7 +95,7 @@
 	  rm -f $(DESTDIR)$(imagedir)/$$f; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \
 	done
-	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
+	-if test -n "$(DESKTOP_FILE_INSTALL)"; then \
 	  $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
 	    --vendor www.octave.org octave.desktop; \
 	fi