Link against $LIBS

ropensci · Nov 8, 2018 · 67c51ca · 67c51ca
1 parent 30f217e
commit 67c51ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,6 @@
 1.3
   - Fix for sys 2.0 (do not quote arg on Windows)
+  - Link unrtf executable with $(LIBS) hopefully fixes Solaris
 
 1.2
   - Fix format-truncation warning in GCC-7

diff --git a/src/Makevars b/src/Makevars
@@ -8,16 +8,13 @@ LIBUNRTF = \
 
 UNRTF = unrtf$(WIN)
 
-# On OSX we need to link iconv
-MACFLAGS = $(subst -framework,-liconv -framework,$(FOUNDATION_LIBS))
-
 # On Windows we need to link Riconv and winsock
 WINFLAGS = $(subst 64,-lws2_32 $(LIBR) -lRiconv,$(subst 32,64,$(WIN)))
 
 all: clean $(UNRTF)
 
 $(UNRTF): $(LIBUNRTF) 
-	$(CC) $(CFLAGS) -o $(UNRTF) $(LIBUNRTF) $(MACFLAGS) $(WINFLAGS) 
+	$(CC) $(CFLAGS) -o $(UNRTF) $(LIBUNRTF) $(MACFLAGS) $(WINFLAGS) $(LIBS)
 	mkdir -p $(INSTDIR)/bin
 	cp -f $(UNRTF) $(INSTDIR)/bin/
 	cp -Rf share $(INSTDIR)/