# HG changeset patch
# User jwe
# Date 782191652 0
# Node ID 238071e680a71d7a315def6573bb9ee7efbab917
# Parent  eedd566a1e370f37fdc3dcb44a84fb8335a93231
[project @ 1994-10-15 03:20:48 by jwe]

diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 dnl along with Octave; see the file COPYING.  If not, write to the Free
 dnl Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 dnl
-AC_REVISION($Revision: 1.59 $)dnl
+AC_REVISION($Revision: 1.60 $)dnl
 AC_PREREQ(1.8)dnl
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h kpathsea/c-auto.h)
@@ -98,7 +98,7 @@
 octfiledir='$(libdir)/octave/$(version)/oct/$(target_host_type)'
 localoctfilepath='$(datadir)/octave/site/oct/$(target_host_type)//'
 fcnfilepath='.:$(localoctfilepath):$(localfcnfilepath):$(octfiledir)//:$(fcnfiledir)//'
-imagepath='.:$(fcnfiledir)/imagelib//'
+imagepath='.:$(datadir)/octave/$(version)/imagelib//'
 dnl
 dnl Handle --enable-run-in-place.  This option makes Octave look for
 dnl info and function files in the same directory tree as the sources.
diff --git a/doinstall.sh b/doinstall.sh
--- a/doinstall.sh
+++ b/doinstall.sh
@@ -118,7 +118,7 @@
 fcnfilepath=".:$localoctfilepath:$localfcnfilepath:$octfiledir//:$fcnfiledir//"
 
 # Where Octave will search to find image files.
-imagedir="$fcnfiledir/imagelib"
+imagedir="$datadir/octave/$version/imagelib"
 imagepath=".:$imagedir//"
 
 cat << EOF
@@ -162,7 +162,7 @@
 echo "installing function files in $fcnfiledir"
 ( cd scripts
   ../mkinstalldirs `find . -type d | sed -e 's,^\./,,' -e "s,^,$fcnfiledir/,"`
-  for f in `find . -name '*.m' -o name octaverc`
+  for f in `find . -name '*.m' -o -name octaverc`
   do
     cp $f $fcnfiledir/$f
     chmod 644 $fcnfiledir/$f
@@ -170,11 +170,11 @@
 
 echo "installing image files in $imagedir"
 ( cd scripts
-  ../mkinstalldirs `find . -type d | sed -e 's,^\./,,' -e "s,^,$imagedir/,"`
   for f in `find . -name '*.img'`
   do
-    cp $f $iamgedir/$f
-    chmod 644 $imagedir/$f
+    file=`basename $f`
+    cp $f $imagedir/$file
+    chmod 644 $imagedir/$file
   done )
 
 echo "installing info files in $infodir"
diff --git a/octMakefile.in b/octMakefile.in
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -32,7 +32,7 @@
 DISTSUBDIRS = $(SUBDIRS) dld test
 
 BINDISTFILES = COPYING ChangeLog NEWS README THANKS INSTALL.OCTAVE \
-	BUGS PROJECTS octave.sh octave-mode.el doinstall.sh \
+	BUGS PROJECTS octave-bug octave.sh octave-mode.el doinstall.sh \
 	mkinstalldirs
 
 # Subdirectories to run `make dist' in
diff --git a/scripts/image/Makefile.in b/scripts/image/Makefile.in
--- a/scripts/image/Makefile.in
+++ b/scripts/image/Makefile.in
@@ -20,7 +20,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-SOURCES = *.m
+SOURCES = *.m octtopnm.c
 IMAGES = *.img
 
 DISTFILES = Makefile.in $(SOURCES) $(IMAGES)