Mercurial > octave-nkf
changeset 5470:6fc86e60819d
[project @ 2005-09-23 19:18:46 by jwe]
| author | jwe |
|---|---|
| date | Fri, 23 Sep 2005 19:18:46 +0000 |
| parents | 7e3bb47187f8 |
| children | 764a4349e492 |
| files | ChangeLog examples/Makefile.in |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 23 19:13:00 2005 +0000 +++ b/ChangeLog Fri Sep 23 19:18:46 2005 +0000 @@ -2,6 +2,10 @@ * examples/Makefile.in (install install-strip): Conditionally install octave.desktop. + (IMAGE_FILES, IMAGE_FILES_NO_DIR): New macros. + (DISTFILES): Include IMAGE_FILES in list. + (install install-strip): Install image file. + * aclocal.m4 (OCTAVE_PROG_DESKTOP_FILE_INSTALL): New macro * configure.in: Use it. * Makeconf.in: Substitute DESKTOP_FILE_INSTALL.
--- a/examples/Makefile.in Fri Sep 23 19:13:00 2005 +0000 +++ b/examples/Makefile.in Fri Sep 23 19:18:46 2005 +0000 @@ -23,7 +23,10 @@ SOURCES = hello.cc oregonator.m oregonator.cc make_int.cc octave.desktop.in -DISTFILES = Makefile.in $(SOURCES) $(SCRIPTS) octave.desktop +IMAGE_FILES = $(srcdir)/octave-sombrero.png +IMAGE_FILES_NO_DIR = $(notdir $(IMAGE_FILES)) + +DISTFILES = Makefile.in $(SOURCES) $(SCRIPTS) $(IMAGE_FILES) octave.desktop SUBDIRS = @@ -40,6 +43,11 @@ $(top_srcdir)/move-if-change $@-t $@ install install-strip: + $(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