diff -r dbd727b03c07 -r 2191b44f19f4 components/r/Makefile --- 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) \