[Swift-commit] r5264 - SwiftApps/SwiftR

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-10-31 14:23:48 -0500 (Mon, 31 Oct 2011)
New Revision: 5264

Modified:
   SwiftApps/SwiftR/Makefile
Log:
swiftr makefile fix to not depend on GNU sed

Modified: SwiftApps/SwiftR/Makefile
===================================================================
--- SwiftApps/SwiftR/Makefile	2011-10-30 21:43:58 UTC (rev 5263)
+++ SwiftApps/SwiftR/Makefile	2011-10-31 19:23:48 UTC (rev 5264)
@@ -16,9 +16,10 @@
 # Extract the version number from the R package description file
 # There should be a line in the file of the form:
 # Version: (major).(minor)
-SWIFTR_VERSION=$(shell sed -n -r 's/^Version:(\W*)([[:digit:]]+\.[[:digit:].]+)/\2/p' Swift/DESCRIPTION)
 
+SWIFTR_VERSION=$(shell sed -n 's/^Version:[ \t]*\([0-9][0-9]*\.[0-9\.]*\)[ \t]*$$/\1/p' Swift/DESCRIPTION)
 
+
 GEN_PKG_NAME=Swift_$(SWIFTR_VERSION).tar.gz
 FULL_PKG=Swift_$(SWIFTR_VERSION)_full.tar.gz
 CRAN_PKG=Swift_$(SWIFTR_VERSION)_cran.tar.gz