Mercurial > octave-nkf

changeset 5466:6a4f87723932

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-09-23 16:42:30 by jwe]
author jwe
date Fri, 23 Sep 2005 16:42:30 +0000
parents d6163c0effd5
children 66ec063e2f4f
files ChangeLog examples/Makefile.in examples/octave.desktop.in
diffstat 3 files changed, 28 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Sep 23 15:42:49 2005 +0000
+++ b/ChangeLog	Fri Sep 23 16:42:30 2005 +0000
@@ -1,3 +1,10 @@
+2005-09-23  John W. Eaton  <jwe@octave.org>
+
+	* octave.desktop.in: New file.  From Soren Hauberg <soren@hauberg.org>.
+	* examples/Makefile.in (SOURCES): Add it to the list.
+	(octave.desktop): New target.
+	(all): Depend on octave.desktop.
+
 2005-09-22  John W. Eaton  <jwe@octave.org>
 
 	* aclocal.m4 (OCTAVE_PROG_PERL): New macro.
--- a/examples/Makefile.in	Fri Sep 23 15:42:49 2005 +0000
+++ b/examples/Makefile.in	Fri Sep 23 16:42:30 2005 +0000
@@ -21,17 +21,24 @@
 
 SCRIPTS = info-emacs-info info-emacs-octave-help
 
-SOURCES = hello.cc oregonator.m oregonator.cc make_int.cc
+SOURCES = hello.cc oregonator.m oregonator.cc make_int.cc octave.desktop.in
 
-DISTFILES = Makefile.in $(SOURCES) $(SCRIPTS)
+DISTFILES = Makefile.in $(SOURCES) $(SCRIPTS) octave.desktop
 
 SUBDIRS = 
 
 DISTSUBDIRS = 
 
-all:
+all: octave.desktop
 .PHONY: all
 
+octave.desktop: octave.desktop.in Makefile ../Makeconf
+	echo "making $@ from $<"
+	$(SED) < $< > $@-t \
+	  -e "s|%OCTAVE_IMAGEDIR%|${imagedir}|" \
+	  -e "s|%OCTAVE_PREFIX%|${prefix}|"
+	$(top_srcdir)/move-if-change $@-t $@
+
 install install-strip:
 	for f in $(SCRIPTS); do \
 	  $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(archlibdir)/$$f; \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/octave.desktop.in	Fri Sep 23 16:42:30 2005 +0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=GNU Octave
+Comment=Scientific Computing using GNU Octave
+TryExec=%OCTAVE_PREFIX%/bin/octave
+Exec=%OCTAVE_PREFIX%/bin/octave
+Icon=%OCTAVE_IMAGEDIR%/octave-sombrero.png
+Terminal=true
+Type=Application
+Categories=Development; Science;
+StartupNotify=false