Mercurial > octave-nkf

changeset 6808:64b2d6bcd54e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-08-10 18:19:32 by jwe]
author jwe
date Fri, 10 Aug 2007 18:19:32 +0000
parents 0089a504fdd6
children 5e61f0bc0c27
files scripts/ChangeLog scripts/image/Makefile.in
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Fri Aug 10 17:34:59 2007 +0000
+++ b/scripts/ChangeLog	Fri Aug 10 18:19:32 2007 +0000
@@ -1,3 +1,10 @@
+2007-08-10  John W. Eaton  <jwe@octave.org>
+
+	* image/Makefile.in (DISTFILES): Also include $(IMAGES) in the list.
+	(install install-strip): Use $(IMAGES), not $(IMAGE_FILES_NO_DIR).
+	(uninstall): Use $(IMAGES), not $(IMAGE_FILES_NO_DIR).
+	(IMAGE_FILES, IMAGE_FILES_NO_DIR): Delete obsolete variables.
+
 2007-08-10  Kai Habel  <kai.habel@gmx.de>
 
 	* plot/patch.m, plot/__patch__.m: New files.
--- a/scripts/image/Makefile.in	Fri Aug 10 17:34:59 2007 +0000
+++ b/scripts/image/Makefile.in	Fri Aug 10 18:19:32 2007 +0000
@@ -28,21 +28,18 @@
 
 IMAGES = default.img
 
-DISTFILES = $(addprefix $(srcdir)/, Makefile.in $(SOURCES))
+DISTFILES = $(addprefix $(srcdir)/, Makefile.in $(SOURCES) $(IMAGES))
 
 FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES))
 FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
 
-IMAGE_FILES = $(wildcard $(srcdir)/*.img)
-IMAGE_FILES_NO_DIR = $(notdir $(IMAGE_FILES))
-
 all: PKG_ADD
 .PHONY: all
 
 install install-strip:
 	$(do-script-install)
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(imagedir)
-	for f in $(IMAGE_FILES_NO_DIR); do \
+	for f in $(IMAGES); do \
 	  rm -f $(DESTDIR)$(imagedir)/$$f; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \
 	done
@@ -51,7 +48,7 @@
 
 uninstall:
 	$(do-script-uninstall)
-	for f in $(IMAGE_FILES_NO_DIR); \
+	for f in $(IMAGES); \
 	  do rm -f $(DESTDIR)$(imagedir)/$$f; \
 	done
 .PHONY: uninstall