changeset 5468:41943dd8d7d8

[project @ 2005-09-23 18:34:46 by jwe]
author jwe
date Fri, 23 Sep 2005 18:34:47 +0000
parents 66ec063e2f4f
children 7e3bb47187f8
files ChangeLog Makeconf.in aclocal.m4 configure.in examples/Makefile.in examples/octave-sombrero.png src/Makefile.in
diffstat 7 files changed, 27 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -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
 
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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,
--- a/configure.in
+++ b/configure.in
@@ -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
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1e5f9a1b0717704ad197b8e38e72fa45ddf8455c
GIT binary patch
literal 6014
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
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -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; \