close #1

raphg · May 31, 2013 · 3a90e0f · 3a90e0f
1 parent 0ed7e1f
commit 3a90e0f
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: iBMQ
 Type: Package
 Title: integrated Bayesian Modeling of eQTL data
-Version: 1.0.1
+Version: 1.1.3
 Date: 2011-10-28
 Author: Marie-Pier Scott-Boyer and Greg Imholte
 Maintainer: Marie-Pier Scott-Boyer <[email protected]>

diff --git a/data/PPA.liver.rda b/data/PPA.liver.rda
diff --git a/data/gene.rda b/data/gene.rda
diff --git a/data/genepos.rda b/data/genepos.rda
diff --git a/data/genotype.liver.rda b/data/genotype.liver.rda
diff --git a/data/map.liver.rda b/data/map.liver.rda
diff --git a/data/phenotype.liver.rda b/data/phenotype.liver.rda
diff --git a/data/probe.liver.rda b/data/probe.liver.rda
diff --git a/data/snp.rda b/data/snp.rda
diff --git a/data/snppos.rda b/data/snppos.rda
diff --git a/inst/README.txt b/inst/README.txt
@@ -32,24 +32,21 @@ C:\Windows\System32\Wbem;
 C:\Windows\System32\WindowsPowerShell\v1.0\;
 C:\Program Files\MiKTeX 2.9\miktex\bin\;
 C:\Program Files\R\R-3.0.1\bin\i386;
-C:\Program Files\GnuWin32\bin
+C:\gsl\i386\bin
 
 In a sample installation, the last line 
 
-"C:\Program Files\GnuWin32\bin"
+"C:\gsl\i386\bin"
 
 contains the GSL binaries.
 
 # Compiling iBMQ from source in Windows
 Compiling iBMQ from source is only recommended for experienced users.
 In addition to setting the "Path" System variable, one must also
-establish User variables "GSL_INC" and "GSL_LIB" leading to 
-GSL header and source files, respectively. 
+establish User variable "LIB_GSL" leading to GSL header and lib files. 
 
 In a sample installation:
-
-GSL_INC: C:/Program\ Files/GnuWin32/include
-GSL_LIB: C:/Program\ Files/GnuWin32/lib
+LIB_GSL: C:/gsl
 
 Note the use of forward slashes separating directories. The character
 "\ " handles spaces in directory names. 

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,2 +1,2 @@
-PKG_CFLAGS = -I$(GSL_INC) $(SHLIB_OPENMP_CFLAGS)
-PKG_LIBS = -L$(GSL_LIB) -lgsl -lgslcblas -lm $(SHLIB_OPENMP_CFLAGS)
+PKG_CPPFLAGS += -I$(RHOME)/src/include -I$(LIB_GSL)$(R_ARCH)/include $(SHLIB_OPENMP_CFLAGS)
+PKG_LIBS += -L$(LIB_GSL)$(R_ARCH)/lib -lgsl -lgslcblas -lm $(SHLIB_OPENMP_CFLAGS)