From: adilger <adilger>
Date: Thu, 1 Apr 2004 00:48:48 +0000 (+0000)
Subject: Fix mismerge from HEAD.
X-Git-Tag: v1_8_0_110~486^6~34
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=082d801f58ae3d2843576f6284fb054f4f023498;p=fs%2Flustre-release.git

Fix mismerge from HEAD.
---

diff --git a/lustre/configure.in b/lustre/configure.in
index aec5d2e..26780cc 100644
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -67,7 +67,7 @@ if test x$enable_inkernel = xyes ; then
 		sh -e -x -c '(cp -f $0.mk $0.in)'
 fi
 
-AM_CONFIG_HEADER(include/config.h)
+AM_CONFIG_HEADER(portals/include/config.h)
 
 AC_OUTPUT([Makefile lvfs/Makefile portals/Makefile portals/Kernelenv \
           portals/libcfs/Makefile portals/portals/Makefile \