Changeset 2192


Ignore:
Timestamp:
Mar 31, 2011 3:28:18 PM (13 years ago)
Author:
gah
Message:
 
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure

    r2191 r2192  
    79027902    MKOCTFILE2=$rp_with_mkoctfile2
    79037903  fi
    7904   OCTAVE_VERSION=2.x.x
    7905   OCTAVE_VERSION_MAJOR=2
     7904  # Have to use octave to get a version, instead of mkoctfile.
     7905  octave=`dirname $MKOCTFILE2`/octave
     7906  OCTAVE_VERSION=`${octave} -v | grep version | cut -d' ' -f4`
     7907  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
    79067908fi
    79077909

  • trunk/configure.in

    r2190 r2192  
    368368    MKOCTFILE2=$rp_with_mkoctfile2
    369369  fi
    370   OCTAVE_VERSION=2.x.x
    371   OCTAVE_VERSION_MAJOR=2
     370  # Have to use octave to get a version, instead of mkoctfile.
     371  octave=`dirname $MKOCTFILE2`/octave
     372  OCTAVE_VERSION=`${octave} -v | grep version | cut -d' ' -f4`
     373  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
    372374fi
    373375
Note: See TracChangeset for help on using the changeset viewer.