From: Antoine Verheijen <antoine@ualberta.ca>
Date: Fri, 3 Dec 2010 07:30:20 +0000 (-0700)
Subject: OpenBSD: Remove duplicate assignment of COMMON_INCLUDE in libafs
X-Git-Tag: upstream/1.6.0.pre2^2~132
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=25221d9665e101e49a070c4393853446f01085ca;p=packages%2Fo%2Fopenafs.git

OpenBSD: Remove duplicate assignment of COMMON_INCLUDE in libafs

When building libafs, the make file variable COMMON_INCLUDE is
assigned a value in two places: Makefile.common.in and
MakefileProto.OBSD.in. The assignment in the latter place is both
wrong and unnecessary. Remove it.

Reviewed-on: http://gerrit.openafs.org/3430
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit ba63d22bfb0b18ab054c39cafafeb8c6881fe687)

Change-Id: I08d46d7e9c288e6b81f8c9cf3a16f6e48ac3462f
Reviewed-on: http://gerrit.openafs.org/3722
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/libafs/MakefileProto.OBSD.in b/src/libafs/MakefileProto.OBSD.in
index dd863187c..9b384db38 100644
--- a/src/libafs/MakefileProto.OBSD.in
+++ b/src/libafs/MakefileProto.OBSD.in
@@ -58,20 +58,6 @@ TOP_SRCDIR = ../..
 
 include Makefile.common
 
-COMMON_INCLUDE = \
-	-I.. \
-	-I../nfs \
-	-I${TOP_SRCDIR} \
-	-I${TOP_SRCDIR}/afs \
-	-I${TOP_SRCDIR}/afs/${MKAFS_OSTYPE} \
-	-I${TOP_SRCDIR}/config \
-	-I${TOP_SRCDIR}/rx \
-	-I${TOP_SRCDIR}/rx/${MKAFS_OSTYPE} \
-	-I${TOP_SRCDIR}/rxkad \
-	-I${TOP_SRCDIR}/util \
-	-I${TOP_SRCDIR}/../include \
-	-I${TOP_SRCDIR}/../include/afs
-
 setup:
 	-mkdir $(KOBJ)
 	-$(RM) -f  $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config