diff --git a/configure b/configure index 6e3da553011..6a72a5d26fb 100755 --- a/configure +++ b/configure @@ -13161,7 +13161,7 @@ fi DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" - LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME)" + LDSHARED="\$(CC) -dynamiclib" STRIP="$STRIP -u -r" COREFOUNDATIONLIB="-framework CoreFoundation" diff --git a/configure.ac b/configure.ac index 9cbbaf03c67..f224711ae28 100644 --- a/configure.ac +++ b/configure.ac @@ -975,7 +975,7 @@ case $host_os in DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" - LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME)" + LDSHARED="\$(CC) -dynamiclib" STRIP="$STRIP -u -r" dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index d126e5bdae3..11278b743a4 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -134,10 +134,10 @@ libwine.dll: $(OBJS) wine.def Makefile.in DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in - $(LDSHARED) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ + $(LDSHARED) -install_name $(libdir)/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib - $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@ + cp -p libwine.$(VERSION).dylib $@ && install_name_tool -id @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME) $@ || $(RM) $@ libwine.dylib: libwine.$(SOVERSION).dylib $(RM) $@ && $(LN_S) libwine.$(SOVERSION).dylib $@