# HG changeset patch
# User jwe
# Date 1127500487 0
# Node ID 41943dd8d7d8d542da739b18b20eb2ef81a73591
# Parent  66ec063e2f4f627a2144ba826de564868eadffe6
[project @ 2005-09-23 18:34:46 by jwe]

diff -r 66ec063e2f4f -r 41943dd8d7d8 ChangeLog
--- a/ChangeLog	Fri Sep 23 17:52:50 2005 +0000
+++ b/ChangeLog	Fri Sep 23 18:34:47 2005 +0000
@@ -1,5 +1,11 @@
 2005-09-23  John W. Eaton  <jwe@octave.org>
 
+	* examples/Makefile.in (install install-strip):
+	Conditionally install octave.desktop.
+	* aclocal.m4 (OCTAVE_PROG_DESKTOP_FILE_INSTALL): New macro
+	* configure.in: Use it.
+	* Makeconf.in: Substitute DESKTOP_FILE_INSTALL.
+
 	* octave.desktop.in: New file.  From Soren Hauberg <soren@hauberg.org>.
 	* examples/Makefile.in (SOURCES): Add it to the list.
 	(octave.desktop): New target.
diff -r 66ec063e2f4f -r 41943dd8d7d8 Makeconf.in
--- a/Makeconf.in	Fri Sep 23 17:52:50 2005 +0000
+++ b/Makeconf.in	Fri Sep 23 18:34:47 2005 +0000
@@ -17,6 +17,8 @@
 
 PERL = @PERL@
 
+DESKTOP_FILE_INSTALL = @DESKTOP_FILE_INSTALL@
+
 # A shell command to extract the version number from version.h.
 getversion = $(SED) -e '/OCTAVE_VERSION/!d' -e 's/.*"\(.*\)".*$$/\1/' -e q
 
diff -r 66ec063e2f4f -r 41943dd8d7d8 aclocal.m4
--- a/aclocal.m4	Fri Sep 23 17:52:50 2005 +0000
+++ b/aclocal.m4	Fri Sep 23 18:34:47 2005 +0000
@@ -812,12 +812,20 @@
 dnl
 dnl OCTAVE_PROG_PERL
 AC_DEFUN(OCTAVE_PROG_PERL,
-[AC_CHECK_PROG(PERL, ${ac_tool_prefix}perl, ${ac_tool_prefix}perl, [])
+[AC_CHECK_PROG(PERL, perl, perl, [])
   AC_SUBST(PERL)
 ])
-# OCTAVE_IEEE754_DATA_FORMAT
-# --------------
-# Check for IEEE 754 data format.
+dnl
+dnl Find desktop-file-install.
+dnl
+dnl OCTAVE_PROG_DESKTOP_FILE_INSTALL
+AC_DEFUN(OCTAVE_PROG_DESKTOP_FILE_INSTALL,
+[AC_CHECK_PROG(DESKTOP_FILE_INSTALL, desktop-file-install, desktop-file-install, [])
+  AC_SUBST(DESKTOP_FILE_INSTALL)
+])
+dnl
+dnl Check for IEEE 754 data format.
+dnl
 AC_DEFUN([OCTAVE_IEEE754_DATA_FORMAT],
 [AC_MSG_CHECKING([for IEEE 754 data format])
 AC_CACHE_VAL(octave_cv_ieee754_data_format,
diff -r 66ec063e2f4f -r 41943dd8d7d8 configure.in
--- a/configure.in	Fri Sep 23 17:52:50 2005 +0000
+++ b/configure.in	Fri Sep 23 18:34:47 2005 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.482 $)
+AC_REVISION($Revision: 1.483 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -1511,6 +1511,8 @@
 INSTALL_SCRIPT='${INSTALL}'
 AC_SUBST(INSTALL_SCRIPT)
 
+OCTAVE_PROG_DESKTOP_FILE_INSTALL
+
 OCTAVE_PROG_GNUPLOT
 OCTAVE_PROG_PAGER
 OCTAVE_PROG_GPERF
diff -r 66ec063e2f4f -r 41943dd8d7d8 examples/Makefile.in
--- a/examples/Makefile.in	Fri Sep 23 17:52:50 2005 +0000
+++ b/examples/Makefile.in	Fri Sep 23 18:34:47 2005 +0000
@@ -40,6 +40,9 @@
 	$(top_srcdir)/move-if-change $@-t $@
 
 install install-strip:
+	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
+	  $(DESKTOP_FILE_INSTALL) --vendor www.octave.org octave.desktop; \
+	fi
 	for f in $(SCRIPTS); do \
 	  $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(archlibdir)/$$f; \
 	done
diff -r 66ec063e2f4f -r 41943dd8d7d8 examples/octave-sombrero.png
Binary file examples/octave-sombrero.png has changed
diff -r 66ec063e2f4f -r 41943dd8d7d8 src/Makefile.in
--- a/src/Makefile.in	Fri Sep 23 17:52:50 2005 +0000
+++ b/src/Makefile.in	Fri Sep 23 18:34:47 2005 +0000
@@ -547,7 +547,7 @@
 
 oct-errno.cc: oct-errno.cc.in ../Makeconf Makefile
 	@echo "making $@ from $<"
-	if test -n "$(PERL)"; then \
+	@if test -n "$(PERL)"; then \
 	  $(PERL) -e 'foreach $$key (keys(%!)) { $$x .= "#if defined ($$key)\n    { \"$$key\", $$key, },\n#endif\n"; }; while (<>) { s/^ *\@SYSDEP_ERRNO_LIST\@/$$x/; print; }' $< > $@.t; \
 	else \
 	  $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@.t; \