From bf1a0619e24a2f8e8b0b05219df15b9e9b280bf7 Mon Sep 17 00:00:00 2001 From: Stefan Anzinger <stefan.anzinger@oracle.com> Date: Mon, 25 Apr 2016 15:55:30 +0200 Subject: [PATCH] Update sed expression for updating R script to work with solaris --- com.oracle.truffle.r.native/run/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.oracle.truffle.r.native/run/Makefile b/com.oracle.truffle.r.native/run/Makefile index 1d52f4ade9..491f44da1a 100644 --- a/com.oracle.truffle.r.native/run/Makefile +++ b/com.oracle.truffle.r.native/run/Makefile @@ -67,7 +67,7 @@ $(FASTR_BIN_DIR)/R: Makefile R.sh Rscript.sh Rscript_exec.sh cp Rscript.sh $(FASTR_BIN_DIR)/Rscript chmod +x $(FASTR_BIN_DIR)/exec/R $(FASTR_BIN_DIR)/execRscript/Rscript $(FASTR_BIN_DIR)/Rscript cp $(SUPPORT_SCRIPTS) $(FASTR_BIN_DIR) - sed -e 's!\(^R_HOME_DIR=\)\(.*\)!\1"$(FASTR_R_HOME)"!' < $(R_SCRIPT) > $(FASTR_BIN_DIR)/R + sed -e 's!^\(R_HOME_DIR=\)\(.*\)!\1"$(FASTR_R_HOME)"!' < $(R_SCRIPT) > $(FASTR_BIN_DIR)/R chmod +x $(FASTR_BIN_DIR)/R touch $(FASTR_ETC_DIR)/ldpaths sed -e "s|\(R_LIBS_USER=.*-'\)\(.*\)'}|\1$(FASTR_R_HOME)/library'}|" < $(GNUR_HOME)/etc/Renviron > $(FASTR_ETC_DIR)/Renviron -- GitLab