PERFORCE change 66222 for review

Wed Dec 1 15:19:32 PST 2004

http://perforce.freebsd.org/chv.cgi?CH=66222

Change 66222 by peter at peter_daintree on 2004/12/01 23:18:54

	Since we define INCLUDEDIR as overridable, use it.

Affected files ...

.. //depot/projects/hammer/etc/Makefile#34 edit
.. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#8 edit
.. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#7 edit
.. //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#5 edit
.. //depot/projects/hammer/gnu/usr.bin/diff/Makefile#3 edit
.. //depot/projects/hammer/gnu/usr.bin/grep/Makefile#6 edit
.. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#8 edit
.. //depot/projects/hammer/lib/libc/yp/Makefile.inc#5 edit
.. //depot/projects/hammer/lib/librpcsvc/Makefile#4 edit
.. //depot/projects/hammer/usr.bin/kdump/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/truss/Makefile#6 edit
.. //depot/projects/hammer/usr.sbin/amd/Makefile.inc#4 edit
.. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#4 edit
.. //depot/projects/hammer/usr.sbin/amd/libamu/Makefile#3 edit
.. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/Makefile#4 edit
.. //depot/projects/hammer/usr.sbin/bootparamd/callbootd/Makefile#3 edit
.. //depot/projects/hammer/usr.sbin/keyserv/Makefile#5 edit
.. //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#4 edit
.. //depot/projects/hammer/usr.sbin/rpc.statd/Makefile#4 edit
.. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/Makefile#4 edit
.. //depot/projects/hammer/usr.sbin/rpc.ypupdated/Makefile#4 edit
.. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#6 edit

Differences ...

==== //depot/projects/hammer/etc/Makefile#34 (text+ko) ====

@@ -191,11 +191,11 @@
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
-		-p ${DESTDIR}/usr/include
+		-p ${DESTDIR}${INCLUDEDIR}
 .if !defined(NO_BIND)
 .if defined(WITH_BIND_LIBS)
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
-	    -p ${DESTDIR}/usr/include
+	    -p ${DESTDIR}/${INCLUDEDIR}
 .endif
 .if !defined(NO_BIND_MTREE)
 .if defined(NO_BIND_CHROOT)

==== //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#8 (text+ko) ====

@@ -27,7 +27,7 @@
 
 # gnu must be before lib to pick correct regex.h
 CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \
-	 -I${DESTDIR}/usr/include/gnu \
+	 -I${DESTDIR}${INCLUDEDIR}/gnu \
 	 -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
 
 DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}

==== //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#7 (text+ko) ====

@@ -12,7 +12,7 @@
 INTERNALLIB=
 
 # gnu must be before lib to pick correct regex.h
-CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}/usr/include/gnu \
+CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}${INCLUDEDIR}/gnu \
 	 -I${CVSDIR}/lib
 CFLAGS+= -DHAVE_CONFIG_H
 YFLAGS=

==== //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#5 (text+ko) ====

@@ -10,7 +10,7 @@
 INTERNALLIB=
 
 # gnu must be before lib to pick correct regex.h
-CFLAGS+= -I../lib -I${DESTDIR}/usr/include/gnu \
+CFLAGS+= -I../lib -I${DESTDIR}${INCLUDEDIR}/gnu \
 	 -I${CVSDIR}/lib -DHAVE_CONFIG_H
 
 SRCS =	diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c context.c ed.c \

==== //depot/projects/hammer/gnu/usr.bin/diff/Makefile#3 (text+ko) ====

@@ -10,7 +10,7 @@
 CFLAGS+=-funsigned-char
 
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff \
-	-I${DESTDIR}/usr/include/gnu
+	-I${DESTDIR}${INCLUDEDIR}/gnu
 CFLAGS+=-DHAVE_CONFIG_H
 CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
 

==== //depot/projects/hammer/gnu/usr.bin/grep/Makefile#6 (text+ko) ====

@@ -7,7 +7,7 @@
 	isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
 	xstrtoumax.c
 
-CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H
+CFLAGS+=-I${.CURDIR} -I${DESTDIR}${INCLUDEDIR}/gnu -DHAVE_CONFIG_H
 
 LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \
 	${BINDIR}/grep ${BINDIR}/fgrep

==== //depot/projects/hammer/lib/libc/rpc/Makefile.inc#8 (text+ko) ====

@@ -30,7 +30,7 @@
 
 CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h
 
-RPCDIR= ${DESTDIR}/usr/include/rpcsvc
+RPCDIR= ${DESTDIR}${INCLUDEDIR}/rpcsvc
 RPCGEN= rpcgen -C
 
 crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h

==== //depot/projects/hammer/lib/libc/yp/Makefile.inc#5 (text+ko) ====

@@ -7,7 +7,7 @@
 SRCS+=	xdryp.c yp.h yp_xdr.c yplib.c
 CLEANFILES+=	yp.h yp_xdr.c
 
-RPCSRC=	${DESTDIR}/usr/include/rpcsvc/yp.x
+RPCSRC=	${DESTDIR}${INCLUDEDIR}/rpcsvc/yp.x
 RPCGEN=	rpcgen -C
 
 yp_xdr.c: ${RPCSRC}

==== //depot/projects/hammer/lib/librpcsvc/Makefile#4 (text+ko) ====

@@ -1,7 +1,7 @@
 #	from: @(#)Makefile    5.10 (Berkeley) 6/24/90
 # $FreeBSD: src/lib/librpcsvc/Makefile,v 1.18 2004/11/13 20:40:29 bz Exp $
 
-.PATH: ${DESTDIR}/usr/include/rpcsvc
+.PATH: ${DESTDIR}${INCLUDEDIR}/rpcsvc
 
 LIB=    rpcsvc
 
@@ -18,7 +18,7 @@
 
 RPCCOM = rpcgen -C
 
-INCDIRS= -I${DESTDIR}/usr/include/rpcsvc
+INCDIRS= -I${DESTDIR}${INCLUDEDIR}/rpcsvc
 
 CFLAGS+= -DYP ${INCDIRS}
 

==== //depot/projects/hammer/usr.bin/kdump/Makefile#2 (text+ko) ====

@@ -10,6 +10,6 @@
 CLEANFILES=	ioctl.c
 
 ioctl.c: mkioctls
-	sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
+	sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
 
 .include <bsd.prog.mk>

==== //depot/projects/hammer/usr.bin/truss/Makefile#6 (text+ko) ====

@@ -29,6 +29,6 @@
 		${.CURDIR}/i386.conf
 
 ioctl.c: ${.CURDIR}/../kdump/mkioctls
-	sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
+	sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
 
 .include <bsd.prog.mk>

==== //depot/projects/hammer/usr.sbin/amd/Makefile.inc#4 (text+ko) ====

@@ -31,8 +31,8 @@
 LIBAMU=		${LIBAMUDIR}/libamu.a
 
 RPCCOM=		rpcgen
-MOUNT_X=	${DESTDIR}/usr/include/rpcsvc/mount.x
-NFS_PROT_X=	${DESTDIR}/usr/include/rpcsvc/nfs_prot.x
+MOUNT_X=	${DESTDIR}${INCLUDEDIR}/rpcsvc/mount.x
+NFS_PROT_X=	${DESTDIR}${INCLUDEDIR}/rpcsvc/nfs_prot.x
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"

==== //depot/projects/hammer/usr.sbin/amd/amd/Makefile#4 (text+ko) ====

@@ -23,7 +23,7 @@
 SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
-	 -I${DESTDIR}/usr/include/rpcsvc
+	 -I${DESTDIR}${INCLUDEDIR}/rpcsvc
 
 DPADD=	${LIBAMU}
 LDADD=	${LIBAMU}

==== //depot/projects/hammer/usr.sbin/amd/libamu/Makefile#3 (text+ko) ====

@@ -23,7 +23,7 @@
 CLEANFILES+=	nfs_prot_x.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu \
-	 -I${DESTDIR}/usr/include/rpcsvc
+	 -I${DESTDIR}${INCLUDEDIR}/rpcsvc
 
 nfs_prot_x.c: ${NFS_PROT_X}
 	${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET}

==== //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/Makefile#4 (text+ko) ====

@@ -13,7 +13,7 @@
 
 CLEANFILES= ${GENSRCS}
 
-RPCSRC=	${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x
+RPCSRC=	${DESTDIR}${INCLUDEDIR}/rpcsvc/bootparam_prot.x
 
 bootparam_prot_svc.c: ${RPCSRC}
 	rpcgen -C -m -o ${.TARGET} ${RPCSRC}

==== //depot/projects/hammer/usr.sbin/bootparamd/callbootd/Makefile#3 (text+ko) ====

@@ -10,7 +10,7 @@
 
 CLEANFILES= ${GENSRCS}
 
-RPCSRC=	${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x
+RPCSRC=	${DESTDIR}${INCLUDEDIR}/rpcsvc/bootparam_prot.x
 
 bootparam_prot_clnt.c: ${RPCSRC}
 	rpcgen -l -o ${.TARGET} ${RPCSRC}

==== //depot/projects/hammer/usr.sbin/keyserv/Makefile#5 (text+ko) ====

@@ -9,7 +9,7 @@
 DPADD=	${LIBMP} ${LIBCRYPTO} ${LIBRPCSVC}
 LDADD=	-lmp -lcrypto -lrpcsvc
 
-RPCDIR=	${DESTDIR}/usr/include/rpcsvc
+RPCDIR=	${DESTDIR}${INCLUDEDIR}/rpcsvc
 
 CLEANFILES= crypt_svc.c crypt.h
 

==== //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#4 (text+ko) ====

@@ -6,7 +6,7 @@
 MLINKS=	rpc.lockd.8 lockd.8
 SRCS=	kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c
 
-CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc
+CFLAGS+= -I. -I${DESTDIR}${INCLUDEDIR}/rpcsvc
 #WARNS?= 2
 
 DPADD=	${LIBRPCSVC} ${LIBUTIL}
@@ -14,7 +14,7 @@
 
 CLEANFILES= nlm_prot_svc.c nlm_prot.h test
 
-RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x
+RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/nlm_prot.x
 RPCGEN= rpcgen -L -C
 
 nlm_prot_svc.c: ${RPCSRC}

==== //depot/projects/hammer/usr.sbin/rpc.statd/Makefile#4 (text+ko) ====

@@ -12,7 +12,7 @@
 
 CLEANFILES= sm_inter_svc.c sm_inter.h
 
-RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x
+RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/sm_inter.x
 RPCGEN= rpcgen -L -C
 
 sm_inter_svc.c: ${RPCSRC}

==== //depot/projects/hammer/usr.sbin/rpc.yppasswdd/Makefile#4 (text+ko) ====

@@ -1,6 +1,6 @@
 # $FreeBSD: src/usr.sbin/rpc.yppasswdd/Makefile,v 1.21 2004/10/18 21:29:20 ru Exp $
 
-RPCDIR=	${DESTDIR}/usr/include/rpcsvc
+RPCDIR=	${DESTDIR}${INCLUDEDIR}/rpcsvc
 
 .PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \
        ${.CURDIR}/../../libexec/ypxfr ${RPCDIR}

==== //depot/projects/hammer/usr.sbin/rpc.ypupdated/Makefile#4 (text+ko) ====

@@ -16,7 +16,7 @@
 
 CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h
 
-RPCDIR=	${DESTDIR}/usr/include/rpcsvc
+RPCDIR=	${DESTDIR}${INCLUDEDIR}/rpcsvc
 RPCGEN= rpcgen -I -C
 
 # We need to remove the 'static' keyword from _rpcsvcstate so that

==== //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#6 (text+ko) ====

@@ -45,7 +45,7 @@
 .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
 DPADD+= ${LIBCRYPTO}
 LDADD+= -lcrypto
-CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H
+CFLAGS+= -I${DESTDIR}${INCLUDEDIR}/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H
 .endif
 
 version.c: ${TCPDUMP_DISTDIR}/VERSION
