--- ijs/Makefile.in.orig Sun Mar 20 20:47:00 2005 +++ ijs/Makefile.in Sun Mar 20 20:48:34 2005 @@ -7,10 +7,10 @@ EXE= # todo: this needs to be .dylib on OS X - write a test -SHARED_LDFLAGS=-shared -SHARED_OBJ=.so -#SHARED_LDFLAGS=-dylib -#SHARED_OBJ=.dylib +#SHARED_LDFLAGS=-shared +#SHARED_OBJ=.so +SHARED_LDFLAGS=-dynamiclib +SHARED_OBJ=.dylib FE=-o IJS_EXEC_SERVER=ijs_exec_unix$(OBJ) @@ -60,8 +60,8 @@ $(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config install: all - $(INSTALL) ijs_client_example$(EXE) -c $(DESTDIR)$(bindir)/ijs_client_example$(EXE) - $(INSTALL) ijs-config -c $(DESTDIR)$(bindir)/ijs-config + $(INSTALL) ijs_client_example$(EXE) $(DESTDIR)$(bindir)/ijs_client_example$(EXE) + $(INSTALL) ijs-config $(DESTDIR)$(bindir)/ijs-config $(INSTALL) libijs.a $(DESTDIR)$(libdir)/libijs.a $(INSTALL) libijs$(SHARED_OBJ) $(DESTDIR)$(libdir)/libijs$(SHARED_OBJ) -mkdir $(DESTDIR)$(pkgincludedir) --- src/unix-dll.mak.orig Sun Mar 20 21:16:38 2005 +++ src/unix-dll.mak Sun Mar 20 21:19:55 2005 @@ -45,12 +45,12 @@ GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME) # shared library -GS_SONAME=lib$(GS).so -GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) -GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) +GS_SONAME=lib$(GS).dylib +GS_SONAME_MAJOR=lib$(GS).$(GS_VERSION_MAJOR).dylib +GS_SONAME_MAJOR_MINOR=lib$(GS).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).dylib GS_SO=$(BINDIR)/$(GS_SONAME) -GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR) -GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR) +GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) +GS_SO_MAJOR_MINOR=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR) # Shared object is built by redefining GS_XE in a recursive make. @@ -74,7 +74,7 @@ # ------------------------- Recursive make targets ------------------------- # -SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\ +SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -dynamiclib -install_name $(GS_SO_MAJOR)'\ GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\ STDIO_IMPLEMENTATION=c\ DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\ --- ijs/ijs_server_example.c.orig Sun Mar 20 23:05:39 2005 +++ ijs/ijs_server_example.c Sun Mar 20 23:06:02 2005 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "ijs.h" #include "ijs_server.h" --- src/unixinst.mak.orig Sun Mar 20 23:58:18 2005 +++ src/unixinst.mak Sun Mar 20 23:59:07 2005 @@ -134,7 +134,7 @@ ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\ done ;\ fi ;\ - if ( test -f $$man1dir/ps2ps.$(man1ext) ) ;\ + if ( test -f $$man1dir/gslp.$(man1ext) ) ;\ then for f in $(MAN1_LINKS_GSLP) ;\ do ( cd $$man1dir; rm -f $$f.$(man1ext) ;\ ln -s gslp.$(man1ext) $$f.$(man1ext) ) ;\