diff --git a/com.oracle.truffle.r.native/Makefile b/com.oracle.truffle.r.native/Makefile index 9c24dba8b68693ec9a4dc6fe189c32f67e9ace55..f44d911756a2f071b48981aa5f907a30fc509429 100644 --- a/com.oracle.truffle.r.native/Makefile +++ b/com.oracle.truffle.r.native/Makefile @@ -27,13 +27,7 @@ export TOPDIR = $(CURDIR) export R_VERSION = 3.1.3 - -ifndef GNUR_HOME export GNUR_HOME = $(TOPDIR)/gnur/R-$(R_VERSION) -export GNUR_HOME_ORIGIN = local -else -export GNUR_HOME_ORIGIN = environment -endif all: $(MAKE) -C gnur diff --git a/com.oracle.truffle.r.native/gnur/Makefile b/com.oracle.truffle.r.native/gnur/Makefile index 90ee209245bebe97cfbe49a041c865df5a5d30a2..8b034678383fd380c42d5859196426f51c89b857 100644 --- a/com.oracle.truffle.r.native/gnur/Makefile +++ b/com.oracle.truffle.r.native/gnur/Makefile @@ -27,20 +27,12 @@ all: makegnur $(MAKE) -f Makefile.platform $(MAKE) -f Makefile.libs -ifeq ($(GNUR_HOME_ORIGIN), environment) -makegnur: -else makegnur: $(MAKE) -f Makefile.gnur -endif clean: cleangnur $(MAKE) -f Makefile.libs clean $(MAKE) -f Makefile.platform clean -ifeq ($(GNUR_HOME_ORIGIN), environment) -cleangnur: -else cleangnur: $(MAKE) -f Makefile.gnur clean -endif