changeset 5554:3f1a39aa2012

[project @ 2005-11-30 15:54:38 by jwe]
author jwe
date Wed, 30 Nov 2005 15:54:38 +0000
parents 87c9641d938f
children dbdba35033a6
files ChangeLog examples/Makefile.in
diffstat 2 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -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: