# HG changeset patch
# User jwe
# Date 1170906439 0
# Node ID 195382e92d51f6415e51d18d927f87474ad6b086
# Parent  300fb48803e3c67ca5d154312d036483e3fc8d89
[project @ 2007-02-08 03:47:19 by jwe]

diff -r 300fb48803e3 -r 195382e92d51 ChangeLog
--- 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.
diff -r 300fb48803e3 -r 195382e92d51 Makeconf.in
--- 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 \
diff -r 300fb48803e3 -r 195382e92d51 scripts/plot/contour.m
--- 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