[Rinside-commits] r257 - in pkg: . src

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

Author: edd
Date: 2012-09-10 02:03:40 +0200 (Mon, 10 Sep 2012)
New Revision: 257

Modified:
   pkg/DESCRIPTION
   pkg/src/Makevars.win
Log:
Uwe says CRAN built RInside with --merge-multiarch which he has now undone
all should now be good, so not resetting version number 
and reverting Makevars.win to cp to ../inst/lib


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-09-09 17:38:00 UTC (rev 256)
+++ pkg/DESCRIPTION	2012-09-10 00:03:40 UTC (rev 257)
@@ -1,6 +1,6 @@
 Package: RInside
 Title: C++ classes to embed R in C++ applications
-Version: 0.2.8.2
+Version: 0.2.8
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois
 Maintainer: Dirk Eddelbuettel <edd at debian.org>

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2012-09-09 17:38:00 UTC (rev 256)
+++ pkg/src/Makevars.win	2012-09-10 00:03:40 UTC (rev 257)
@@ -19,7 +19,8 @@
 
 USERLIBST =	libRInside.a
 USERLIB =	libRInside.dll
-USERDIR =	$(R_PACKAGE_DIR)/inst/lib$(R_ARCH)
+#USERDIR =	$(R_PACKAGE_DIR)/inst/lib$(R_ARCH)
+USERDIR =	../inst/lib$(R_ARCH)
 
 PKG_CPPFLAGS += -I. -I../inst/include/
 PKG_LIBS = 	$(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")