$NetBSD: patch-af,v 1.6 2010/02/23 20:31:26 drochner Exp $ --- base/unix-dll.mak.orig 2009-10-19 20:24:53.000000000 +0000 +++ base/unix-dll.mak @@ -52,12 +52,12 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_ LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR) # MacOS X -#GS_SOEXT=dylib -#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) -#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) -#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) +#Darwin#GS_SOEXT=dylib +#Darwin#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) +#Darwin#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) +#Darwin#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) #LDFLAGS_SO=-dynamiclib -flat_namespace -#LDFLAGS_SO=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR) +#Darwin#LDFLAGS_SO=-dynamiclib -install_name $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME) GS_SO=$(BINDIR)/$(GS_SONAME) @@ -80,15 +80,15 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \ - $(LDFLAGS) -L$(BINDIR) -l$(GS) + $(LDFLAGS) -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \ - $(LDFLAGS) -L$(BINDIR) -l$(GS) $(SOC_LIBS) + $(LDFLAGS) -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS) # ------------------------- Recursive make targets ------------------------- # -SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\ +SODEFS=LDFLAGS='$(LDFLAGS)' LDFLAGS_SO='$(LDFLAGS_SO)'\ GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\ STDIO_IMPLEMENTATION=c\ DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\