From 03da36cda6dd19ae4ae36a599b6915270a25b312 Mon Sep 17 00:00:00 2001 From: Da Zheng Date: Fri, 31 Oct 2014 16:43:32 -0400 Subject: [PATCH] [Graph]: allow variables in Makevars defined in shell. --- flash-graph/Rpkg/src/Makevars | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/flash-graph/Rpkg/src/Makevars b/flash-graph/Rpkg/src/Makevars index 8858a5c5..5e1ce494 100644 --- a/flash-graph/Rpkg/src/Makevars +++ b/flash-graph/Rpkg/src/Makevars @@ -1,9 +1,15 @@ # The absolute path of the directory where Rcpp header files are stored. -RCPP_INCLUDE = +ifndef RCPP_INCLUDE + RCPP_INCLUDE = . +endif # The absolute path of the directory where FlashGraph source code is. -FG_DIR = +ifndef FG_DIR + FG_DIR = . +endif # The absolute path of the directory where FlashGraph is built. -FG_LIB = +ifndef FG_LIB + FG_LIB = $(FG_DIR)/build +endif #BOOST_LOG=1 OMP_FLAG = -fopenmp PKG_LIBS = -L$(FG_LIB)/flash-graph/libgraph-algs -lgraph-algs -L$(FG_LIB)/flash-graph -lgraph