From 3073b3971bc272f32b564c464a75c1d63a469321 Mon Sep 17 00:00:00 2001
From: Stanislaw Jastrzebski <staszek.jastrzebski@gmail.com>
Date: Sat, 19 Sep 2015 10:45:35 +0100
Subject: [PATCH] packThis.sh fix and Makevars fix

---
 src/Makevars     | 2 +-
 src/Makevars.win | 4 ++--
 src/packThis.sh  | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Makevars b/src/Makevars
index e903b0c2..ebe2dd7f 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -20,4 +20,4 @@ BLAS_LIBS = `$(R_HOME)/bin/R CMD config BLAS_LIBS`
 # Do not delete R_CPPFLAGS, it will break tests
 PKG_CPPFLAGS = $(GCC_STD) $(PREPROCESS) $(R_CPPFLAGS) $(INCLUDES) -pthread
 PKG_CXXFLAGS = --std=c++0x
-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(R_LIBS)
+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(R_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
index d5e10ef7..b5932a24 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -16,6 +16,6 @@ R_CPPFLAGS := $(shell R CMD config --cppflags)  $(shell echo 'Rcpp:::CxxFlags()'
 LAPACK_LIBS := $(shell R CMD config LAPACK_LIBS)
 BLAS_LIBS := $(shell R CMD config BLAS_LIBS)
 
-PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(GCC_STD) $(PREPROCESS) $(R_CPPFLAGS) $(INCLUDES) -Wall -pedantic -mtune=native -static-libstdc++ -static-libgcc -lstdc++ -lpthread
+PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(GCC_STD) $(PREPROCESS) $(R_CPPFLAGS) $(INCLUDES) -mtune=native -static-libstdc++ -static-libgcc -lstdc++ -lpthread
 PKG_CXXFLAGS := --std=c++0x
-PKG_LIBS := $(PKG_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(R_LIBS) -static-libstdc++ -static-libgcc -lstdc++ -lpthread
+PKG_LIBS := $(PKG_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(R_LIBS) $(FLIBS) -static-libstdc++ -static-libgcc -lstdc++ -lpthread
diff --git a/src/packThis.sh b/src/packThis.sh
index de1d3c83..3cc4ac06 100755
--- a/src/packThis.sh
+++ b/src/packThis.sh
@@ -16,7 +16,7 @@ echo "Creating folder structure"
 mkdir -p $destination
 
 echo "Copy necessary files"
-rsync -rP --exclude=".*" --exclude="demo/samples/*" --exclude="inst/data_sets/*" --exclude="cmake/*" --exclude="build/*" --exclude="doc/*" --exclude="libs/*" --exclude="tests/*" --exclude="..Rcheck/*" --include="*.cpp" --include="*.h" --include="*.hpp" --include="*.Rd" --include="*.c" --include="*.R" --include="*/" --exclude="*" . $destination
+rsync -rP --exclude=".*" --exclude="demo/samples/*" --exclude="inst/data_sets/*" --exclude="cmake/*" --exclude="build/*" --exclude="doc/*" --exclude="libs/*" --exclude="tests/*" --exclude="..Rcheck/*" --include="*.cpp" --include="*.h" --include="*.hpp" --include="*.Rd" --include="*.c" --include="*.R" --include="*/" --exclude="*" --exclude="pkg/*" --exclude="pkg" . $destination
 
 # Copy datasets
 mkdir $destination/data
@@ -32,6 +32,7 @@ cp LICENSE $destination
 cp NAMESPACE $destination
 cp demo/00Index $destination/demo
 cp src/Makevars $destination/src
+cp src/Makevars.win $destination/src
 cp inst/include/svmlight/Makefile $destination/inst/include/svmlight/
 cp inst/include/svmlight/LICENSE.txt $destination/inst/include/svmlight/
 
@@ -41,4 +42,4 @@ cp inst/include/svmlight/LICENSE.txt $destination/inst/include/svmlight/
 rm -r $destination/..Rcheck
 rm -r $destination/.git
 rm -r $destination/.idea
-
+rm -r pkg/pkg