Ignore:
Timestamp:
2016-10-14T19:02:14+13:00 (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/mgpp/text/Makefile.in

    r30203 r30863  
    6161INSTALL_PROGRAM = @INSTALL_PROGRAM@
    6262LDFLAGS = @LDFLAGS@
    63 DEP_LIBS = ../lib/libmgpplib.a $(AFLIBS) ../../../packages/iconv/lib/libiconv.a
    64 LIBS = $(DEP_LIBS) -lstdc++ @LIBS@
    6563TOUCH = echo timestamp >
    6664AWK = @AWK@
    6765GSDLOS = @gsdlos@
     66ifeq ($(GSDLOS),darwin)
     67  DEP_LIBS = ../lib/libmgpplib.a $(AFLIBS)
     68  LIBS = $(DEP_LIBS) -liconv -lstdc++ @LIBS@
     69else
     70  DEP_LIBS = ../lib/libmgpplib.a $(AFLIBS) ../../../packages/iconv/lib/libiconv.a
     71  LIBS = $(DEP_LIBS) -lstdc++ @LIBS@
     72endif
     73
    6874
    6975datadir = $(prefix)/share
Note: See TracChangeset for help on using the changeset viewer.