[Lunar-commits] r26189 - moonbase/trunk/science/octave

[Dennis Veatch]

Author: stumbles
Date: 2007-10-11 20:54:56 +0200 (Thu, 11 Oct 2007)
New Revision: 26189

Modified:
   moonbase/trunk/science/octave/POST_INSTALL
   moonbase/trunk/science/octave/PRE_BUILD
Log:

It also like gfortran and lets fix that symlink at the end.


Modified: moonbase/trunk/science/octave/POST_INSTALL
===================================================================
--- moonbase/trunk/science/octave/POST_INSTALL	2007-10-11 18:42:21 UTC (rev 26188)
+++ moonbase/trunk/science/octave/POST_INSTALL	2007-10-11 18:54:56 UTC (rev 26189)
@@ -1,5 +1,5 @@
  if [ ! `grep /usr/lib/octave /etc/ld.so.conf` ]; then
  echo /usr/lib/octave >> /etc/ld.so.conf 
  fi &&
- ln -s /usr/lib/octave-${VERSION} /usr/lib/octave &&
+ ln -fs /usr/lib/octave-${VERSION} /usr/lib/octave &&
  ldconfig

Modified: moonbase/trunk/science/octave/PRE_BUILD
===================================================================
--- moonbase/trunk/science/octave/PRE_BUILD	2007-10-11 18:42:21 UTC (rev 26188)
+++ moonbase/trunk/science/octave/PRE_BUILD	2007-10-11 18:54:56 UTC (rev 26189)
@@ -1,4 +1,7 @@
-if  ! [ -e  /usr/bin/g77 ]; then
+if  [ -e  /usr/bin/g77 ] || [ -e /usr/bin/gfortran ]; then
+        message "${PROBLEM_COLOR}gcc has fortran present.${DEFAULT_COLOR}" &&
+        true ;
+      else
         message "${PROBLEM_COLOR}g77 is required to install this module.  Rebuild gcc with it enabled.${DEFAULT_COLOR}" &&
         false
 fi &&