[Rcpp-commits] r1116 - pkg/Rcpp/src

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

Author: romain
Date: 2010-04-25 22:19:54 +0200 (Sun, 25 Apr 2010)
New Revision: 1116

Modified:
   pkg/Rcpp/src/Makevars
Log:
try to protect execution of the Makevars in R CMD check

Modified: pkg/Rcpp/src/Makevars
===================================================================
--- pkg/Rcpp/src/Makevars	2010-04-23 11:43:16 UTC (rev 1115)
+++ pkg/Rcpp/src/Makevars	2010-04-25 20:19:54 UTC (rev 1116)
@@ -28,19 +28,25 @@
 PKG_CPPFLAGS += -I../inst/include/
 
 userLibrary: 	$(USERLIB) $(USERLIBST)
-		- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
-		cp $(USERLIB) $(USERDIR)$(R_ARCH)
-		cp $(USERLIBST) $(USERDIR)$(R_ARCH)
-		rm $(USERLIB) $(USERLIBST)
+ifneq ($(DYLIB_EXT),)
+			- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
+			cp $(USERLIB) $(USERDIR)$(R_ARCH)
+			cp $(USERLIBST) $(USERDIR)$(R_ARCH)
+			rm $(USERLIB) $(USERLIBST)
+endif
 
 $(USERLIB): 	$(OBJECTS)
-		$(SHLIB_CXXLD) -o $(USERLIB) $^ $(SHLIB_CXXLDFLAGS) $(ALL_LIBS)
-		@if test -e "/usr/bin/install_name_tool"; then /usr/bin/install_name_tool -id $(R_PACKAGE_DIR)/lib$(R_ARCH)/$(USERLIB) $(USERLIB); fi
-
+ifneq ($(DYLIB_EXT),)
+			$(SHLIB_CXXLD) -o $(USERLIB) $^ $(SHLIB_CXXLDFLAGS) $(ALL_LIBS)
+			@if test -e "/usr/bin/install_name_tool"; then /usr/bin/install_name_tool -id $(R_PACKAGE_DIR)/lib$(R_ARCH)/$(USERLIB) $(USERLIB); fi
+endif
+		
 $(USERLIBST): 	$(OBJECTS)
-		$(AR) qc $(USERLIBST) $^
-		@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
-
+ifneq ($(DYLIB_EXT),)
+			$(AR) qc $(USERLIBST) $^
+			@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
+endif
+		
 .PHONY: 	all clean userLibrary 
 
 clean: