allow for undisciplined packages Rserver and RcppClassic

git-svn-id: https://svn.r-project.org/R/trunk@65655 00db46b3-68df-0310-9c12-caf00c1e9a41
wch · May 19, 2014 · 021ec34 · 021ec34
1 parent 9753994
commit 021ec34
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/etc/Makeconf.in b/etc/Makeconf.in
@@ -123,7 +123,8 @@ ALL_CXXFLAGS = $(R_XTRA_CXXFLAGS) $(PKG_CXXFLAGS) $(CXXPICFLAGS) $(SHLIB_CXXFLAG
 ALL_OBJCFLAGS = $(PKG_OBJCFLAGS) $(CPICFLAGS) $(SHLIB_CFLAGS) $(OBJCFLAGS)
 ALL_OBJCXXFLAGS = $(PKG_OBJCXXFLAGS) $(CXXPICFLAGS) $(SHLIB_CXXFLAGS) $(OBJCXXFLAGS)
 ALL_FFLAGS = $(R_XTRA_FFLAGS) $(PKG_FFLAGS) $(FPICFLAGS) $(SHLIB_FFLAGS) $(FFLAGS)
-ALL_LIBS = $(PKG_LIBS) $(SHLIB_LIBADD) $(LIBR1)@DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
+## LIBR here as a couple of packages use this without SHLIB_LINK
+ALL_LIBS = $(PKG_LIBS) $(SHLIB_LIBADD) $(LIBR)@DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .cpp .d .f .f90 .f95 .m .mm .M .o