From 01b350941cc14a0080b13aa990eee737f78f54ee Mon Sep 17 00:00:00 2001
From: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Tue, 1 Jul 2003 20:10:09 +0000
Subject: [PATCH] STABLE12-kill-usr-include-20030701

FIXES 1652

kill explicit makefile refs to -I/usr/include.
---
 src/fsprobe/Makefile.in     | 2 +-
 src/libafs/Makefile.common  | 2 +-
 src/libuafs/Makefile.common | 2 +-
 src/login/Makefile.in       | 2 +-
 src/package/Makefile.in     | 2 +-
 src/uss/Makefile.in         | 2 +-
 src/xstat/Makefile.in       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in
index 4a158c9e7..7a7c907eb 100644
--- a/src/fsprobe/Makefile.in
+++ b/src/fsprobe/Makefile.in
@@ -36,7 +36,7 @@ CFLAGS=${DBG} -I. \
 	-I${TOP_INCDIR} \
 	-I${TOP_INCDIR}/afs \
 	-I${SRCDIR} \
-	-I/usr/include ${XCFLAGS}
+	${XCFLAGS}
 
 RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h
 
diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common
index 73a84c64d..72be7001f 100644
--- a/src/libafs/Makefile.common
+++ b/src/libafs/Makefile.common
@@ -8,7 +8,7 @@
 # Common elements for Makefiles for all system types.
 #
 SHELL=/bin/sh
-INCLUDE= -I.  -I/usr/include -I${TOP_SRCDIR}/config
+INCLUDE= -I. -I${TOP_SRCDIR}/config
 AFS	=../afs
 RX	=../rx
 AFSINT	=../afsint
diff --git a/src/libuafs/Makefile.common b/src/libuafs/Makefile.common
index 00a930380..94a3fd821 100644
--- a/src/libuafs/Makefile.common
+++ b/src/libuafs/Makefile.common
@@ -9,7 +9,7 @@
 #
 
 SHELL=/bin/sh
-INCLUDE=  -I. -I/usr/include -I${TOP_SRCDIR}/config
+INCLUDE=  -I. -I${TOP_SRCDIR}/config
 UOBJ	=../UAFS
 WEBOBJ	=../AFSWEB
 AFS	=../afs
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index fb1bc0bb5..6de55b536 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -53,7 +53,7 @@ KAFSLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${TOP_LIBDIR}/libprot.a \
 	   ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
 	   ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a
 
-INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I/usr/include -I/usr/include/sys
+INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} 
 CFLAGS=	${DBG} ${XCFLAGS} ${INCLUDES}
 LIBC=	/lib/libc.a
 SRCS=	login.c 
diff --git a/src/package/Makefile.in b/src/package/Makefile.in
index 6ec6a692c..32a135e81 100644
--- a/src/package/Makefile.in
+++ b/src/package/Makefile.in
@@ -27,7 +27,7 @@ SHELL    = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCLUDES=-I/usr/include -I${TOP_SRCDIR}/config -I${TOP_INCDIR}
+INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}
 DBGFLAG  = -UDEBUG
 CFLAGS   = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS)
 YFLAGS   = -vd
diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in
index c18e6d1b7..2924b0a15 100644
--- a/src/uss/Makefile.in
+++ b/src/uss/Makefile.in
@@ -32,7 +32,7 @@ include ../config/Makefile.${SYS_NAME}
 
 all: uss
 
-CFLAGS=${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \
+CFLAGS=${DBUG} -I${TOP_SRCDIR}/config \
 	-I${TOP_INCDIR} -I. ${XCFLAGS}
 
 #
diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in
index 81cb339e9..70fea8d11 100644
--- a/src/xstat/Makefile.in
+++ b/src/xstat/Makefile.in
@@ -35,7 +35,7 @@ CFLAGS=${DBUG} -I. \
 	-I${TOP_SRCDIR}/config \
 	-I${TOP_INCDIR} \
 	-I${TOP_INCDIR}/afs \
-	-I/usr/include ${XCFLAGS}
+	${XCFLAGS}
 
 RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h
 
-- 
2.39.5