$NetBSD: patch-ad,v 1.18 2015/05/13 12:48:05 ryoon Exp $ Adjust EXTRA_LIBS and @WANT_R_SHLIB_TRUE@R_bin_LDADD --- src/main/Makefile.in.orig 2015-03-18 23:03:54.000000000 +0000 +++ src/main/Makefile.in @@ -103,13 +103,13 @@ EXTRA_STATIC_LIBS = \ $(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL) $(R_TZONE) STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS) -EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS) +EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS) @LIBMULTITHREAD@ R_binary = R.bin R_bin_OBJECTS = Rmain.o @WANT_R_SHLIB_FALSE@$(OBJECTS) @WANT_R_SHLIB_FALSE@R_bin_LDADD = $(MAIN_OBJS) $(EXTRA_STATIC_LIBS) $(EXTRA_LIBS) ## Linked against -lRblas becasue -lR is and otherwise ld complains. -@WANT_R_SHLIB_TRUE@R_bin_LDADD = -lR @BLAS_SHLIB_TRUE@-lRblas +@WANT_R_SHLIB_TRUE@R_bin_LDADD = -L../../lib@R_ARCH@ ${COMPILER_RPATH_FLAG}$(Rexeclibdir) -lR @BLAS_SHLIB_TRUE@-lRblas @BUILD_LTO_FALSE@R_bin_DEPENDENCIES =@WANT_R_SHLIB_FALSE@ libR.a @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp libR_la = libR$(DYLIB_EXT)