[Rcpp-commits] r2623 - pkg/RcppGSL/inst/skeleton

[noreply at r-forge.r-project.org]

Author: edd
Date: 2010-11-30 16:25:31 +0100 (Tue, 30 Nov 2010)
New Revision: 2623

Modified:
   pkg/RcppGSL/inst/skeleton/configure
   pkg/RcppGSL/inst/skeleton/configure.win
Log:
use one sed call instead of three


Modified: pkg/RcppGSL/inst/skeleton/configure
===================================================================
--- pkg/RcppGSL/inst/skeleton/configure	2010-11-30 14:24:51 UTC (rev 2622)
+++ pkg/RcppGSL/inst/skeleton/configure	2010-11-30 15:25:31 UTC (rev 2623)
@@ -4,7 +4,8 @@
 GSL_LIBS=`${R_HOME}/bin/Rscript -e "RcppGSL:::LdFlags()"`
 RCPP_LDFLAGS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
 
-sed -e "s|@GSL_LIBS@|${GSL_LIBS}|" src/Makevars.in |
-    sed -e "s|@GSL_CFLAGS@|${GSL_CFLAGS}|" |
-    sed -e "s|@RCPP_LDFLAGS@|${RCPP_LDFLAGS}|" > src/Makevars
+sed -e "s|@GSL_LIBS@|${GSL_LIBS}|" \
+    -e "s|@GSL_CFLAGS@|${GSL_CFLAGS}|" \
+    -e "s|@RCPP_LDFLAGS@|${RCPP_LDFLAGS}|" \
+    src/Makevars.in > src/Makevars
 

Modified: pkg/RcppGSL/inst/skeleton/configure.win
===================================================================
--- pkg/RcppGSL/inst/skeleton/configure.win	2010-11-30 14:24:51 UTC (rev 2622)
+++ pkg/RcppGSL/inst/skeleton/configure.win	2010-11-30 15:25:31 UTC (rev 2623)
@@ -2,7 +2,8 @@
 GSL_LIBS=`${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe -e "RcppGSL:::LdFlags()"`
 RCPP_LDFLAGS=`${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe -e "Rcpp:::LdFlags()"`
 
-sed -e "s|@GSL_LIBS@|${GSL_LIBS}|" src/Makevars.in |
-    sed -e "s|@GSL_CFLAGS@|${GSL_CFLAGS}|" |
-    sed -e "s|@RCPP_LDFLAGS@|${RCPP_LDFLAGS}|" > src/Makevars.win
+sed -e "s|@GSL_LIBS@|${GSL_LIBS}|" \
+    -e "s|@GSL_CFLAGS@|${GSL_CFLAGS}|" |
+    -e "s|@RCPP_LDFLAGS@|${RCPP_LDFLAGS}|" \
+    src/Makevars.in > src/Makevars.win