From 2e96bc51f5c4d88fa7b0378c0e5a0946a5b8aee9 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Thu, 28 Aug 2014 21:23:27 -0700
Subject: [PATCH] do things

---
 R-package/src/Makevars     | 11 +++++++----
 R-package/src/Makevars.win | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/R-package/src/Makevars b/R-package/src/Makevars
index 17e236bf7..bfd52838f 100644
--- a/R-package/src/Makevars
+++ b/R-package/src/Makevars
@@ -2,6 +2,9 @@
 export CC  = gcc
 export CXX = g++
 
+# package root
+PKGROOT=../../
+
 # expose these flags to R CMD SHLIB
 PKG_CPPFLAGS = -O3 -Wno-unknown-pragmas  -DXGBOOST_CUSTOMIZE_ERROR_  -fPIC  $(SHLIB_OPENMP_CFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CFLAGS)
@@ -17,10 +20,10 @@ OBJECTS= xgboost_R.o $(CXXOBJ)
 all: $(SHLIB)
 $(SHLIB): $(OBJECTS)
 
-xgboost_wrapper.o: ../../wrapper/xgboost_wrapper.cpp
-xgboost_io.o: ../../src/io/io.cpp 
-xgboost_gbm.o: ../../src/gbm/gbm.cpp
-xgboost_updater.o: ../../src/tree/updater.cpp
+xgboost_wrapper.o: $(PKGROOT)/wrapper/xgboost_wrapper.cpp
+xgboost_io.o: $(PKGROOT)/src/io/io.cpp 
+xgboost_gbm.o: $(PKGROOT)/src/gbm/gbm.cpp
+xgboost_updater.o: $(PKGROOT)/src/tree/updater.cpp
 
 $(CXXOBJ) : 
 	$(CXX) -c $(PKG_CPPFLAGS) -o $@ $(firstword $(filter %.cpp %.c, $^) )
diff --git a/R-package/src/Makevars.win b/R-package/src/Makevars.win
index c3c97bc64..4cf21511a 100644
--- a/R-package/src/Makevars.win
+++ b/R-package/src/Makevars.win
@@ -2,6 +2,9 @@
 export CC  = gcc
 export CXX = g++
 
+# package root
+PKGROOT=../../
+
 # expose these flags to R CMD SHLIB
 PKG_CPPFLAGS = -O3 -Wno-unknown-pragmas  -DXGBOOST_CUSTOMIZE_ERROR_ -fopenmp -fPIC  $(SHLIB_OPENMP_CFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CFLAGS)
@@ -22,10 +25,10 @@ OBJECTS= xgboost_R.o $(CXXOBJ)
 all: $(SHLIB)
 $(SHLIB): $(OBJECTS)
 
-xgboost_wrapper.o: ../../wrapper/xgboost_wrapper.cpp
-xgboost_io.o: ../../src/io/io.cpp
-xgboost_gbm.o: ../../src/gbm/gbm.cpp
-xgboost_updater.o: ../../src/tree/updater.cpp
+xgboost_wrapper.o: $(PKGROOT)/wrapper/xgboost_wrapper.cpp
+xgboost_io.o: $(PKGROOT)/src/io/io.cpp
+xgboost_gbm.o: $(PKGROOT)/src/gbm/gbm.cpp
+xgboost_updater.o: $(PKGROOT)/src/tree/updater.cpp
 
 $(CXXOBJ) : 
 	$(CXX) -c $(PKG_CPPFLAGS) -o $@ $(firstword $(filter %.cpp %.c, $^) )