Changeset 30863 for main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

Timestamp:

2016-10-14T19:02:14+13:00 (8 years ago)

Author:

ak19

Message:

Changes to get libiconv issues on MacOS El Capitan straightened out, since DYLD_LIBRARY_PATH gets wiped out on these newer Mac OS versions. The current solution is to use the system libiconv on MacOS machines that are already specific to Macs (and therefore compatible with Macs).

File:

• main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

@@ -39 +39 @@
   QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS) -static-libstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@
   PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a -static-libstdc++ @LIBS@
+else ifeq ($(GSDLOS),darwin)
+  QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS) -liconv @LIBS@
+  PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a @LIBS@
 else
   QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS) ../../../packages/iconv/lib/libiconv.a @LIBS@