--- a/components/r/Makefile	Wed Mar 30 18:48:54 2016 -0700
+++ b/components/r/Makefile	Thu Mar 31 12:22:20 2016 -0700
@@ -51,7 +51,11 @@
 LDFLAGS += $(LD_DEF_LIBS)
 
 STUDIO_LIBS_PATH =	$(USRLIBDIR)/studio/64
-R_LIBS_PATH =		$(USRLIBDIR64)/R/lib
+# R_LIBS_PATH is used when creating /usr/lib/64/R/etc/Makeconf
+# Using a resolved pathname here (rather than say $(USRLIBDIR64)/R/lib) so
+# that the Makeconf-GNU.patch patch used by the COMPONENT_POST_INSTALL_ACTION
+# will just work on both platforms.
+R_LIBS_PATH =		/usr/lib/64/R/lib
 JAVA_LIBS_PATH =	$(JAVA8_HOME)/jre/lib/$(MACH64)/server
 
 LDFLAGS += -L$(STUDIO_LIBS_PATH) -R$(STUDIO_LIBS_PATH) \

--- a/components/r/files/Makeconf-GNU.patch	Wed Mar 30 18:48:54 2016 -0700
+++ b/components/r/files/Makeconf-GNU.patch	Thu Mar 31 12:22:20 2016 -0700
@@ -68,7 +68,7 @@
  ## needed by R CMD config
  LIBnn = lib
  LIBTOOL = $(SHELL) "$(R_HOME)/bin/libtool"
--LDFLAGS = -norunpath -m64 -KPIC -DPIC -lc -L/usr/lib/studio/64 -R/usr/lib/studio/64 -lsunperf -lfsu -lmtsk -lpicl -lkstat -L/usr/lib/amd64/R/lib -R/usr/lib/amd64/R/lib
+-LDFLAGS = -norunpath -m64 -KPIC -DPIC -lc -L/usr/lib/studio/64 -R/usr/lib/studio/64 -lsunperf -lfsu -lmtsk -lpicl -lkstat -L/usr/lib/64/R/lib -R/usr/lib/64/R/lib
 +LDFLAGS = -m64 -fpic -lc -L/usr/lib/studio/64 -R/usr/lib/studio/64 -lsunperf -lfsu -lmtsk -lpicl -lkstat -L/usr/lib/64/R/lib -R/usr/lib/64/R/lib
  LTO = 
  ## needed to build applications linking to static libR