[Octave-cvsupdate] SF.net SVN: octave:[9520] trunk/octave-forge/main/sockets/src/Makefile

[<car...@us...>]

Revision: 9520
          http://octave.svn.sourceforge.net/octave/?rev=9520&view=rev
Author:   carandraug
Date:     2012-01-10 18:05:12 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
sockets: fix regex on makefile for development versions. Patch submitted by marco atzeri <mar...@gm...>

Modified Paths:
--------------
    trunk/octave-forge/main/sockets/src/Makefile

Modified: trunk/octave-forge/main/sockets/src/Makefile
===================================================================
--- trunk/octave-forge/main/sockets/src/Makefile	2012-01-10 18:00:16 UTC (rev 9519)
+++ trunk/octave-forge/main/sockets/src/Makefile	2012-01-10 18:05:12 UTC (rev 9520)
@@ -3,9 +3,9 @@
 
 #See which octave version we run by querying mkoctfile for its version
 #string. (Is there a better way to do this? This looks horrible.) 
-majorversion :=$(shell mkoctfile --version 2>&1 |sed -e 's/^.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\)+\?$$/\1/g')
-minorversion:=$(shell mkoctfile --version 2>&1 |sed -e 's/^.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\)+\?$$/\2/g')
-microversion:=$(shell mkoctfile --version 2>&1 |sed -e 's/^.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\)+\?$$/\3/g')
+majorversion := $(shell  mkoctfile --version 2>&1  | sed  -e 's/[ .+]/\n/g' |sed  -n '3p')
+minorversion := $(shell  mkoctfile --version 2>&1  | sed  -e 's/[ .+]/\n/g' |sed  -n '4p')
+microversion := $(shell  mkoctfile --version 2>&1  | sed  -e 's/[ .+]/\n/g' |sed  -n '5p')
 
 VFLAGS=-DMAJORVERSION=$(majorversion) 
 VFLAGS+=-DMINORVERSION=$(minorversion)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.