# HG changeset patch # User jwe # Date 782181575 0 # Node ID f2fcdc711b5fcfeaaf2ef6674126e2a59b2479c2 # Parent 8caf71319a4d87cc22462960d41f1fd0dee21dd9 [project @ 1994-10-15 00:39:35 by jwe] diff --git a/doinstall.sh b/doinstall.sh --- a/doinstall.sh +++ b/doinstall.sh @@ -10,6 +10,9 @@ # ask octave to tell us the version number version=`./octave -v 2>/dev/null | awk '/version/ { print $NF }'` +# ask octave to tell us the target host type +target_host_type=`echo computer | ./octave -q` + if test -z "$version" then echo "doinstall.sh: unable to extract version number from Octave!" @@ -80,7 +83,8 @@ # to this site (i.e. customizations), before consulting # ${fcnfiledir}. This should be a colon-separated list of # directories. -localfcnfilepath="$datadir/octave/site/m//" +localfcnfiledir="$datadir/octave/site/m" +localfcnfilepath="$localfcnfiledir//" # Where to put executables to be run by Octave rather than # the user. This path usually includes the Octave version @@ -98,7 +102,8 @@ # dynamically loaded and that are specific to this site # (i.e. customizations), before consulting ${octfiledir}. This should # be a colon-separated list of directories. -localoctfilepath="$datadir/octave/site/oct/$target_host_type//" +localoctfiledir="$datadir/octave/site/oct/$target_host_type" +localoctfilepath="$localoctfiledir//" # Where Octave will search to find its function files. Before # changing this, check to see if your purpose wouldn't @@ -122,7 +127,8 @@ EOF DIRS_TO_MAKE="$bindir $datadir $libdir $includedir $mandir $infodir \ - $fcnfiledir $archlibdir $octfiledir $imagedir" + $fcnfiledir $archlibdir $octfiledir $imagedir \ + $localfcnfiledir $localoctfiledir" ./mkinstalldirs $DIRS_TO_MAKE chmod 755 $DIRS_TO_MAKE