File: net/arping/files/gar-base.diff
base-0 patch-1
Line 1Line 1
diff --speed-large-files --minimal -Nru tmp/arping-1.05/Makefile work/main.d/arping-1.05/Makefile
--- tmp/arping-1.05/Makefile        Sun Nov 3 11:57:57 2002
+++ work/main.d/arping-1.05/Makefile        Mon Feb 17 14:57:28 2003
@@ -11,6 +11,8 @@
# explicit pcap include dir is for redhat which is fux0red
CFLAGS=-g -I/usr/local/include -L/usr/local/lib -DUSE_NETIF=$(USE_NETIF) -DOPENBSD=$(OPENBSD) -DLINUX=$(LINUX) -DSOLARIS=$(SOLARIS) -DFREEBSD=$(FREEBSD) -DMACOSX=$(MACOSX) -I/usr/include/pcap
diff --speed-large-files --minimal -Nru tmp/arping-1.07/Makefile work/main.d/arping-1.07/Makefile
--- tmp/arping-1.07/Makefile        2002-11-03 13:57:57.000000000 -0600
+++ work/main.d/arping-1.07/Makefile        2003-06-19 12:15:50.000000000 -0500
@@ -9,7 +9,9 @@
MACOSX=0
+LIBNET_CONFIG ?= libnet-config
 # explicit pcap include dir is for redhat which is fux0red
-CFLAGS=-g -I/usr/local/include -L/usr/local/lib -DUSE_NETIF=$(USE_NETIF) -DOPENBSD=$(OPENBSD) -DLINUX=$(LINUX) -DSOLARIS=$(SOLARIS) -DFREEBSD=$(FREEBSD) -DMACOSX=$(MACOSX) -I/usr/include/pcap
+#CFLAGS=-g -I/usr/local/include -L/usr/local/lib -DUSE_NETIF=$(USE_NETIF) -DOPENBSD=$(OPENBSD) -DLINUX=$(LINUX) -DSOLARIS=$(SOLARIS) -DFREEBSD=$(FREEBSD) -DMACOSX=$(MACOSX) -I/usr/include/pcap
+
+

+LIBNET_CONFIG ?= libnet-config

usage:
        @echo
 usage:
        @echo
        @echo "usage: make [ target ]"
@@ -59,11 +61,11 @@
@@ -53,22 +55,22 @@
        make USE_NETIF=0 SOLARIS=1 all

install:
-        install -c arping /usr/local/bin/arping
-        install arping.8 /usr/local/man/man8/arping.8
+        install -c arping $(DESTDIR)$(bindir)/arping
+        install arping.8 $(DESTDIR)$(mandir)/man8/arping.8

all: $(TARGETS)

arping.o: arping.c
-        gcc -Wall $(CFLAGS) -c `libnet-config --defines` `libnet-config --cflags` arping.c
 all: $(TARGETS)

arping.o: arping.c
-        gcc -Wall $(CFLAGS) -c `libnet-config --defines` `libnet-config --cflags` arping.c
+        gcc -Wall $(CFLAGS) -c `$(LIBNET_CONFIG) --defines` `$(LIBNET_CONFIG) --cflags` arping.c
+        $(CC) -Wall $(CFLAGS) -c `$(LIBNET_CONFIG) --defines` `$(LIBNET_CONFIG) --cflags` arping.c

O_arping=arping.o
arping: $(O_arping)
-        gcc $(CFLAGS) -g -o $@ $(O_arping) `libnet-config --libs` -lpcap
O_arping=arping.o
arping: $(O_arping)
-        gcc $(CFLAGS) -g -o $@ $(O_arping) `libnet-config --libs` -lpcap
+        gcc $(CFLAGS) -g -o $@ $(O_arping) `$(LIBNET_CONFIG) --libs` -lpcap
+        $(CC) $(CFLAGS) -g -o $@ $(O_arping) `$(LIBNET_CONFIG) --libs` -lpcap

O_arping2=arping-2/arping.c
arping2: arping-2/arping
O_arping2=arping-2/arping.c
arping2: arping-2/arping

 arping-2/arping: $(O_arping2)
-        gcc -I/usr/src/Libnet-1.1.0/include -L/usr/src/Libnet-1.1.0/src -o arping arping-2/arping.c -lnet -lpcap
+        $(CC) $(CFLAGS) -o arping arping-2/arping.c -lnet -lpcap

clean:
        rm -f *.o $(TARGETS)