Mercurial > octave-nkf
changeset 6279:195382e92d51
[project @ 2007-02-08 03:47:19 by jwe]
| author | jwe |
|---|---|
| date | Thu, 08 Feb 2007 03:47:19 +0000 |
| parents | 300fb48803e3 |
| children | 1705b7847b8e |
| files | ChangeLog Makeconf.in scripts/plot/contour.m |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 07 22:23:37 2007 +0000 +++ b/ChangeLog Thu Feb 08 03:47:19 2007 +0000 @@ -1,3 +1,9 @@ +2007-02-07 John W. Eaton <jwe@octave.org> + + * Makeconf.in (do-script-install): Use $(FCN_FILES) for list of + files instead of $(FCN_FILES_NO_DIR). Use basename to get + filename with no directory part. + 2007-02-07 Michael Goffioul <michael.goffioul@swing.be> * aclocal.m4 (OCTAVE_HDF5_DLL): New macro.
--- a/Makeconf.in Wed Feb 07 22:23:37 2007 +0000 +++ b/Makeconf.in Thu Feb 08 03:47:19 2007 +0000 @@ -628,9 +628,10 @@ define do-script-install $(top_srcdir)/mkinstalldirs \ $(addprefix $(DESTDIR), $(fcnfiledir)/$(script_sub_dir)) -for f in $(FCN_FILES_NO_DIR); do \ - rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \ - $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \ +for f in $(FCN_FILES); do \ + fbase=`basename $$f`; \ + rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$fbase; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$fbase; \ done $(top_srcdir)/mkpkgadd $(DESTDIR)$(fcnfiledir)/$(script_sub_dir) > $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t if [ -n "`cat $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t`" ]; then \
--- a/scripts/plot/contour.m Wed Feb 07 22:23:37 2007 +0000 +++ b/scripts/plot/contour.m Thu Feb 08 03:47:19 2007 +0000 @@ -68,7 +68,7 @@ ccb = interp1 (levx, cmap(:,3), clev); ii = i1+1:i1+clen; - line (c(1,ii), c(2,ii), "color", [ccr, ccg, ccb, 1]); + line (c(1,ii), c(2,ii), "color", [ccr, ccg, ccb]); i1 += c(2,i1)+1; endwhile