Uniquely name the distribution directory variable so that it can be overridden

for multiple packages at the same time.
This commit is contained in:
Paul Traina 1996-08-21 16:50:15 +00:00
parent d17e5f0b6f
commit 9f6ca50ce7
2 changed files with 15 additions and 15 deletions

View File

@ -1,5 +1,5 @@
# Makefile for libpcap
# $Id: Makefile,v 1.9 1996/08/19 21:00:45 pst Exp $
# $Id: Makefile,v 1.10 1996/08/20 05:43:51 pst Exp $
LIB= pcap
SRCS= pcap-bpf.c \
@ -21,18 +21,18 @@ SHLIB_MINOR=1
#
# Magic to grab sources out of src/contrib
#
DISTDIR?=${.CURDIR}/../../contrib/libpcap
CFLAGS+=-I${DISTDIR} -I${DISTDIR}/lbl
.PATH: ${DISTDIR}
.PATH: ${DISTDIR}/bpf/net
PCAP_DISTDIR?=${.CURDIR}/../../contrib/libpcap
CFLAGS+=-I${PCAP_DISTDIR} -I${PCAP_DISTDIR}/lbl
.PATH: ${PCAP_DISTDIR}
.PATH: ${PCAP_DISTDIR}/bpf/net
beforeinstall:
-cmp -s ${DISTDIR}/pcap.h ${DESTDIR}/usr/include/pcap.h || \
-cmp -s ${PCAP_DISTDIR}/pcap.h ${DESTDIR}/usr/include/pcap.h || \
( $(INSTALL) -c -o ${BINOWN} -g ${BINGRP} -m 444 \
${DISTDIR}/pcap.h ${DESTDIR}/usr/include; )
-cmp -s ${DISTDIR}/pcap-namedb.h ${DESTDIR}/usr/include/pcap-namedb.h || \
${PCAP_DISTDIR}/pcap.h ${DESTDIR}/usr/include; )
-cmp -s ${PCAP_DISTDIR}/pcap-namedb.h ${DESTDIR}/usr/include/pcap-namedb.h || \
( $(INSTALL) -c -o ${BINOWN} -g ${BINGRP} -m 444 \
${DISTDIR}/pcap-namedb.h ${DESTDIR}/usr/include; )
${PCAP_DISTDIR}/pcap-namedb.h ${DESTDIR}/usr/include; )
scanner.o: tokdefs.h

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.12 1996/08/19 21:55:56 pst Exp $
# $Id: Makefile,v 1.13 1996/08/20 05:44:01 pst Exp $
PROG= tcpdump
CFLAGS+=-DHAVE_FCNTL_H=1 -DHAVE_NET_SLIP_H=1 -DTIME_WITH_SYS_TIME=1 \
@ -20,12 +20,12 @@ CLEANFILES+= version.c
DPADD+= ${LIBL} ${LIBPCAP}
LDADD+= -ll -lpcap
DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump
CFLAGS+= -I${DISTDIR}/lbl
.PATH: ${DISTDIR}
TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump
CFLAGS+= -I${TCPDUMP_DISTDIR}/lbl
.PATH: ${TCPDUMP_DISTDIR}
version.c: ${DISTDIR}/VERSION
version.c: ${TCPDUMP_DISTDIR}/VERSION
rm -f version.c ; \
sed 's/.*/char version[] = "&";/' ${DISTDIR}/VERSION > version.c
sed 's/.*/char version[] = "&";/' ${TCPDUMP_DISTDIR}/VERSION > version.c
.include <bsd.prog.mk>