[Rquantlib-commits] r316 - in pkg/RQuantLib: . src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2011-04-04 14:41:58 +0200 (Mon, 04 Apr 2011)
New Revision: 316

Modified:
   pkg/RQuantLib/ChangeLog
   pkg/RQuantLib/src/Makevars.win
Log:
use lib${R_ARCH}


Modified: pkg/RQuantLib/ChangeLog
===================================================================
--- pkg/RQuantLib/ChangeLog	2011-04-03 22:03:18 UTC (rev 315)
+++ pkg/RQuantLib/ChangeLog	2011-04-04 12:41:58 UTC (rev 316)
@@ -1,7 +1,11 @@
+2011-04-04  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/Makevars.win: Simplied using lib${R_ARCH}
+
 2011-04-03  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.3.7
-	
+
 	* man/ConvertibleBond.Rd: Commented-out URLs with 70+ character
 	length as they trigger a bug when the corresponding latex manual is
 	typeset with the a4 style file. Thanks to Uwe Ligges for spotting this.

Modified: pkg/RQuantLib/src/Makevars.win
===================================================================
--- pkg/RQuantLib/src/Makevars.win	2011-04-03 22:03:18 UTC (rev 315)
+++ pkg/RQuantLib/src/Makevars.win	2011-04-04 12:41:58 UTC (rev 316)
@@ -12,9 +12,4 @@
 ## The environment variable QUANTLIB_ROOT has to point to an existing build of QuantLib
 ## With R 2.12.0 and later, we also support 32 and 64 bit builds and need to differentiate
 PKG_CXXFLAGS=-I$(QUANTLIB_ROOT) -I. 
-ifeq ("$(WIN)", "64")
-  PKG_LIBS=$(RCPP_LDFLAGS) -L$(QUANTLIB_ROOT)/lib/x64 -lQuantLib
-else
-  PKG_LIBS=$(RCPP_LDFLAGS) -L$(QUANTLIB_ROOT)/lib/i386 -lQuantLib
-endif   
-
+PKG_LIBS=$(RCPP_LDFLAGS) -L$(QUANTLIB_ROOT)/lib${R_ARCH} -lQuantLib