Changeset 12715

Timestamp:

07/24/12 15:34:56 (13 years ago)

Author:

Eric.Larour

Message:

Ignore some files in svn. Some bug fixing in the install.

Location:

issm/trunk-jpl/externalpackages/octave

Files:

• . (modified) (1 prop)
• install.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/octave/install.sh

@@ -3 +3 @@
 #Some cleanup
 version=3.6.1
-rm -rf src install octave-$version octave-$version.tar.gz
+rm -rf src install octave-$version 
 mkdir install src
 
@@ -18 +18 @@
 #install
 cd src 
+./configure --prefix=$ISSM_DIR/externalpackages/octave/install --disable-readline
 
-exit
-make 
-
-#Compile 
-cd ../install
-mkdir lib
-cd lib
-cp ../../src/*.a .
-ln -s octave_LINUX.a octave.a
-ln -s octave_LINUX.a liboctave.a
+if [ -z $NUMCPUS ];
+then
+        make
+        make install
+else
+        make -j $NUMCPUS
+        make -j $NUMCPUS install
+fi