I believe this makefile change fixes the problems in the build outside

the source tree.  Interestingly I did NOT need Amrut patches, but only
tested this for UML.

diff --git a/lustre/configure.in b/lustre/configure.in
index d4bed74..9365acb 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -54,6 +54,12 @@ AC_ARG_ENABLE(portalsdir, [  --enable-portalsdir=[path] (deprecated) set path to
 PORTALS=$enable_portalsdir
 AC_SUBST(PORTALS)
 
+portalslib_def='$(top_srcdir)/../portals'
+AC_ARG_WITH(portalslib, [  --with-portalslib=[path] set path to Portals library (default=../portals/linux/utils)], enable_portalslib=$withval)
+AC_ARG_ENABLE(portalslib, [  --enable-portalslib=[path] (deprecated) set path to Portals lib (default=../portals/linux/utils)],, enable_portalslib=$portalslib_def)
+PORTALSLIB=$enable_portalslib/linux/utils
+AC_SUBST(PORTALSLIB)
+
 AC_MSG_CHECKING(if make dep has been run in kernel source)
 if test -f $LINUX/include/linux/config.h ; then
        AC_MSG_RESULT(yes)

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index f01b8ed..497fc75 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,8 +1,7 @@
 # Administration utilities Makefile
 DEFS=
 
-CFLAGS:=-g -O2 -I. -I$(PORTALS)/include  -I$(srcdir)/../include -Wall\
- -L$(PORTALS)/linux/utils
+CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(PORTALS)/include  -I$(srcdir)/../include -Wall -L$(PORTALSLIB)
 KFLAGS:=
 CPPFLAGS = $(HAVE_LIBREADLINE)
 obdctl_LDADD := $(LIBREADLINE)