# HG changeset patch
# User jwe
# Date 1133366078 0
# Node ID 3f1a39aa20120b38e173bc44bc5bd4b431644a64
# Parent  87c9641d938f920a62d6c6cdbbf22672733edb48
[project @ 2005-11-30 15:54:38 by jwe]

diff -r 87c9641d938f -r 3f1a39aa2012 ChangeLog
--- a/ChangeLog	Wed Nov 30 05:55:43 2005 +0000
+++ b/ChangeLog	Wed Nov 30 15:54:38 2005 +0000
@@ -1,3 +1,8 @@
+2005-11-30  John W. Eaton  <jwe@octave.org>
+
+	* examples/Makefile.in (install install-strip): Install images and
+	desktop file.
+
 2005-11-29  Rafael Laboissiere  <rafael@debian.org>
 
 	* emacs/octave-mod.el: Ensure that key bindings for 
diff -r 87c9641d938f -r 3f1a39aa2012 examples/Makefile.in
--- a/examples/Makefile.in	Wed Nov 30 05:55:43 2005 +0000
+++ b/examples/Makefile.in	Wed Nov 30 15:54:38 2005 +0000
@@ -46,17 +46,15 @@
 	for f in $(SCRIPTS); do \
 	  $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(archlibdir)/$$f; \
 	done
-#
-# Don't do this by default, or maybe at all.
-#
-#	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(imagedir)
-#	for f in $(IMAGE_FILES_NO_DIR); do \
-#	  rm -f $(DESTDIR)$(imagedir)/$$f; \
-#	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \
-#	done
-#	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
-#	  $(DESKTOP_FILE_INSTALL) --vendor www.octave.org octave.desktop; \
-#	fi
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(imagedir)
+	for f in $(IMAGE_FILES_NO_DIR); do \
+	  rm -f $(DESTDIR)$(imagedir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \
+	done
+	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
+	  $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
+	    --vendor www.octave.org octave.desktop;
+	fi
 .PHONY: install install-strip
 
 tags: