From 144209521ca5f7ced7fc7adb94352a019306986f Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 26 Sep 2008 21:53:01 +0000 Subject: [PATCH] Use "libpcap.A.dylib", not "libpcap.0.dylib", as the "install name" of the OS X shared library; that's what it is in OS X, and that's what gets built into clients linked against it, so it's not going to change in OS X as that'd break binary compatibility. --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index d564cd7..60c7deb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.128 2008-09-26 21:48:49 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.129 2008-09-26 21:53:01 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -331,7 +331,7 @@ libpcap.so: $(OBJ) libpcap.dylib: $(OBJ) rm -f libpcap*.dylib $(CC) -dynamiclib -undefined error -o libpcap.`cat VERSION`.dylib $(OBJ) \ - -install_name $(libdir)/libpcap.0.dylib \ + -install_name $(libdir)/libpcap.A.dylib \ -compatibility_version 1 \ -current_version `cat VERSION` @@ -468,7 +468,7 @@ install-shared-so: libpcap.so $(INSTALL_PROGRAM) libpcap.so.`cat VERSION` $(DESTDIR)$(libdir)/libpcap.so.`cat VERSION` install-shared-dylib: libpcap.dylib $(INSTALL_PROGRAM) libpcap.`cat VERSION`.dylib $(DESTDIR)$(libdir)/libpcap.`cat VERSION`.dylib - VER=`cat VERSION`; cd $(DESTDIR)$(libdir) && ln -sf libpcap.$$VER.dylib libpcap.0.dylib; ln -sf libpcap.0.dylib libpcap.dylib + VER=`cat VERSION`; cd $(DESTDIR)$(libdir) && ln -sf libpcap.$$VER.dylib libpcap.A.dylib; ln -sf libpcap.A.dylib libpcap.dylib uninstall: rm -f $(DESTDIR)$(libdir)/libpcap.a