From cb2b538abf22c2ac9d8d9f6a7e5f76455082153d Mon Sep 17 00:00:00 2001
From: brian <brian>
Date: Tue, 21 Jul 2009 19:18:21 +0000
Subject: [PATCH] b=19248 i=rread

We cannot use make style variables in the CPPFLAGS variable because that
variable is used later on in the configure script, which is bash, not make.
---
 build/autoconf/lustre-build.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 6005f11..78b7e05 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -677,7 +677,7 @@ AC_SUBST(ENABLE_INIT_SCRIPTS)
 #
 AC_DEFUN([LB_CONFIG_HEADERS],
 [AC_CONFIG_HEADERS([config.h])
-CPPFLAGS="-include \$(top_builddir)/config.h $CPPFLAGS"
+CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
 EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
 AC_SUBST(EXTRA_KCFLAGS)
 ])
@@ -765,7 +765,7 @@ if test $target_cpu == "powerpc64"; then
 	CC="$CC -m64"
 fi
 
-CPPFLAGS="-I\$(top_builddir)/$LIBCFS_INCLUDE_DIR -I\$(top_srcdir)/$LIBCFS_INCLUDE_DIR-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
 
 LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
 AC_SUBST(LLCPPFLAGS)
-- 
1.8.3.1