From 67f0b69a4ceeeba25bdc005e7621fa2b500dc33f Mon Sep 17 00:00:00 2001
From: hetong007 <hetong007@gmail.com>
Date: Tue, 16 Jun 2015 11:30:11 -0700
Subject: [PATCH] change makefile to be compatible with r-travis

---
 .travis.yml | 11 +++--------
 Makefile    |  5 +++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 651a9bc2f..2910c15b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,21 +14,16 @@ before_install:
     - ./travis-tool.sh bootstrap
 
 install:
-    - cd ./R-package
+    - make Rpack
+    - cd ./xgboost
     - ../travis-tool.sh install_deps
 
 script: 
     - bash ../travis-tool.sh run_tests  
-    - bash cat /home/travis/build/dmlc/xgboost/R-package/xgboost.Rcheck/00install.out
 
 after_failure: cat /home/travis/build/dmlc/xgboost/R-package/xgboost.Rcheck/00install.out
 
-on_failure:
-    - cat /home/travis/build/dmlc/xgboost/R-package/xgboost.Rcheck/00install.out
-    - ../travis-tool.sh dump_logs
-    
-after_script: cat /home/travis/build/dmlc/xgboost/R-package/xgboost.Rcheck/00install.out
-
+   
 notifications:
     email:
         recipients:
diff --git a/Makefile b/Makefile
index 360d55e84..49356021a 100644
--- a/Makefile
+++ b/Makefile
@@ -145,6 +145,11 @@ Rpack:
 	cp xgboost/src/Makevars xgboost/src/Makevars.win
 	# R CMD build --no-build-vignettes xgboost
 	R CMD build xgboost
+	# rm -rf xgboost
+	# R CMD check --as-cran xgboost*.tar.gz
+
+Rcheck:
+	make Rpack
 	rm -rf xgboost
 	R CMD check --as-cran xgboost*.tar.gz