SOURCES: plplot-octave3.patch - works now

[baggins]

Author: baggins                      Date: Thu Apr  3 17:58:08 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- works now

---- Files affected:
SOURCES:
   plplot-octave3.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/plplot-octave3.patch
diff -u SOURCES/plplot-octave3.patch:1.1 SOURCES/plplot-octave3.patch:1.2
--- SOURCES/plplot-octave3.patch:1.1	Thu Apr  3 19:52:13 2008
+++ SOURCES/plplot-octave3.patch	Thu Apr  3 19:58:03 2008
@@ -1,16 +1,11 @@
---- plplot-5.8.0/cf/octave.ac~	2008-04-03 19:19:20.000000000 +0200
-+++ plplot-5.8.0/cf/octave.ac	2008-04-03 19:35:38.000000000 +0200
-@@ -84,6 +84,7 @@
+diff -ur plplot-5.8.0/cf/octave.ac plplot-5.8.0-oct3/cf/octave.ac
+--- plplot-5.8.0/cf/octave.ac	2007-11-18 21:04:07.000000000 +0100
++++ plplot-5.8.0-oct3/cf/octave.ac	2008-04-03 19:45:08.000000000 +0200
+@@ -84,10 +84,15 @@
  	# Get Configuration default values for Octave
          AC_MSG_CHECKING([Octave prefix])
          PL_OCTAVE_CONFIG_INFO(OCTAVE_PREFIX, prefix)
-+        OCTAVE_PREFIX=`echo $OCTAVE_PREFIX | sed 's|^[[^/]]\+/|/|'`
-         AC_MSG_RESULT($OCTAVE_PREFIX)
- 
-         AC_MSG_CHECKING([Octave m dir])
---- plplot-5.8.0/cf/octave.ac~	2007-11-18 21:04:07.000000000 +0100
-+++ plplot-5.8.0/cf/octave.ac	2008-04-03 19:11:21.000000000 +0200
-@@ -87,7 +87,10 @@
++        [OCTAVE_PREFIX=`echo $OCTAVE_PREFIX | sed 's|^[^/]\+/|/|'`]
          AC_MSG_RESULT($OCTAVE_PREFIX)
  
          AC_MSG_CHECKING([Octave m dir])
@@ -18,11 +13,12 @@
 +	if test -n "`echo $OCTAVE_VERSION | sed 's/^3.0//p;d;q'`" ; then
 +            # Octave version 3.0
 +            PL_OCTAVE_CONFIG_INFO(OCTAVE_M_DIR, localfcnfiledir)
++            [OCTAVE_M_DIR=`echo $OCTAVE_M_DIR | sed 's|^[^/]\+/|/|'`]
 +        elif test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
              # Octave version 2.1
              PL_OCTAVE_CONFIG_INFO(OCTAVE_M_DIR, localfcnfiledir)
          else
-@@ -106,7 +109,10 @@
+@@ -106,7 +111,11 @@
          AC_MSG_RESULT($OCTAVE_M_DIR)
  
          AC_MSG_CHECKING([Octave oct dir])
@@ -30,6 +26,7 @@
 +	if test -n "`echo $OCTAVE_VERSION | sed 's/^3.0//p;d;q'`" ; then
 +            # Octave version 3.0
 +            PL_OCTAVE_CONFIG_INFO(OCTAVE_OCT_DIR, localoctfiledir)
++            [OCTAVE_OCT_DIR=`echo $OCTAVE_OCT_DIR | sed 's|^[^/]\+/|/|'`]
 +        elif test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
              # Octave version 2.1
              PL_OCTAVE_CONFIG_INFO(OCTAVE_OCT_DIR, localoctfiledir)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/plplot-octave3.patch?r1=1.1&r2=1.2&f=u