Fix port for values of LIBPCAP_OVERWRITE_BASE which are defined.

PR:		ports/95060
Submitted by:	Craig Leres
This commit is contained in:
Bruce M Simpson 2006-08-02 11:22:45 +00:00
parent 5a5ee03832
commit aaed6be69d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=169459

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Thu Jan 8 16:38:30 2004 --- Makefile.in.orig Sun Apr 16 17:17:57 2006
+++ Makefile.in Thu Jan 8 16:41:40 2004 +++ Makefile.in Sun Apr 16 17:18:08 2006
@@ -96,13 +96,17 @@ @@ -97,22 +97,18 @@
CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
@ -12,15 +12,23 @@
ar rc $@ $(OBJ) $(LIBS) ar rc $@ $(OBJ) $(LIBS)
$(RANLIB) $@ $(RANLIB) $@
-shared: libpcap.$(DYEXT)
+#shared: libpcap.$(DYEXT)
-#
-# XXX - this works with GNU ld, but won't necessarily work with native
-# ld on, for example, various SVR4-flavored platforms, or Digital UNIX.
-#
-libpcap.so: $(OBJ)
+libpcap.so.2: $(OBJ) +libpcap.so.2: $(OBJ)
+ @rm -f $@
+ $(CC) -shared -Wl,-x -o libpcap.so.2 -Wl,-soname,libpcap.so.2 `lorder *.o | tsort -q`
+
scanner.c: $(srcdir)/scanner.l
@rm -f $@ @rm -f $@
$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ - ld -shared -o $@.`cat VERSION` $(OBJ)
@@ -154,6 +158,8 @@ + $(CC) -shared -Wl,-x -o libpcap.so.2 -Wl,-soname,libpcap.so.2 `lorder *.o | tsort -q`
install:
# the following rule succeeds, but the result is untested.
libpcap.dylib: $(OBJ)
@@ -173,6 +169,8 @@
install: libpcap.a
[ -d $(DESTDIR)$(libdir) ] || \ [ -d $(DESTDIR)$(libdir) ] || \
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ $(INSTALL_DATA) libpcap.so.2 $(DESTDIR)$(libdir)/libpcap.so.2 + $(INSTALL_DATA) libpcap.so.2 $(DESTDIR)$(libdir)/libpcap.so.2