slight refinement to previous changeset

.hgignore

@@ -105,6 +105,7 @@ com.oracle.truffle.r.native/library/*/lib/*
 com.oracle.truffle.r.native/library/stats/src/fft.c
 com.oracle.truffle.r.native/platform.mk
 com.oracle.truffle.r.native/gnur/Makeconf.done
+com.oracle.truffle.r.native/gnur/platform.mk.temp*
 com.oracle.truffle.r.native/run/Makeconf.etc
 com.oracle.truffle.r.native/include/*.h
 com.oracle.truffle.r.native/include/R_ext/*.h

com.oracle.truffle.r.native/gnur/Makefile.platform

@@ -29,12 +29,14 @@
 OS_NAME := $(shell uname)
 OS_DIR := $(shell echo $(OS_NAME) | tr '[:upper:]' '[:lower:]' )
 
-# need to work from etc/Makeconf as that is the package building version
-
 all: $(TOPDIR)/platform.mk
 
+# need to get BLAS and LAPACK defns from etc/Makeconf
+
 $(TOPDIR)/platform.mk: sedMakeconf $(GNUR_HOME)/Makeconf Makefile
-	sed -f sedMakeconf $(GNUR_HOME)/etc/Makeconf > /dev/null 2>&1
+	sed -f sedMakeconf $(GNUR_HOME)/Makeconf > /dev/null 2>&1
+	sed -f sedEtcMakeconf $(GNUR_HOME)/etc/Makeconf > /dev/null 2>&1
+	cat platform.mk.temp1 platform.mk.temp2 > platform.mk.temp
 	ed platform.mk.temp < edAddFASTR
 	echo OS_NAME = $(OS_NAME) >> platform.mk.temp
 ifeq ($(OS_NAME),SunOS)

com.oracle.truffle.r.native/gnur/edAddFASTR

-/R_HOME/s/R_HOME/FASTR_R_HOME
+g/R_HOME/s/R_HOME/FASTR_R_HOME/
 /^CFLAGS/s/$/ -DFASTR/
 w
 q

com.oracle.truffle.r.native/gnur/sedEtcMakeconf

+/^BLAS_LIBS =.*/ w platform.mk.temp2
+/^LAPACK_LIBS =.*/ w platform.mk.temp2

com.oracle.truffle.r.native/gnur/sedMakeconf

-/^CC =.*/ w platform.mk.temp
-/^CFLAGS =.*/ w platform.mk.temp
-/^DYLIB_.* =.*/ w platform.mk.temp
-/^F77 =.*/ w platform.mk.temp
-/^FFLAGS =.*/ w platform.mk.temp
-/^FPICFLAGS =.*/ w platform.mk.temp
-/^FLIBS =.*/ w platform.mk.temp
-/^BLAS_LIBS =.*/ w platform.mk.temp
-/^LAPACK_LIBS =.*/ w platform.mk.temp
-/^SHLIB_.* = .*/ w platform.mk.temp
+/^CC =.*/ w platform.mk.temp1
+/^CFLAGS =.*/ w platform.mk.temp1
+/^DYLIB_.* =.*/ w platform.mk.temp1
+/^F77 =.*/ w platform.mk.temp1
+/^FFLAGS =.*/ w platform.mk.temp1
+/^FPICFLAGS =.*/ w platform.mk.temp1
+/^FLIBS_IN_SO =.*/ w platform.mk.temp1
+/^SHLIB_.* = .*/ w platform.mk.temp1