Update from HEAD

diff --git a/lustre/include/lustre/Makefile b/lustre/include/lustre/Makefile
index d55fabb..8e3b405 100644 (file)
--- a/lustre/include/lustre/Makefile
+++ b/lustre/include/lustre/Makefile
@@ -77,6 +77,7 @@ PATH_SEPARATOR = :
 AMTAR = ${SHELL} /usr/src/lustre/missing --run tar
 AWK = gawk
 CC = gcc
+CRAY_PORTALS_INCLUDE = 
 DEPDIR = .deps
 ENABLE_DOC = 0
 GMNAL = 
@@ -93,7 +94,7 @@ MOD_LINK = elf_i386
 PACKAGE = lustre
 QSWNAL = 
 RANLIB = ranlib
-RELEASE = 2.4.20_6um_200403182323
+RELEASE = 2.4.20_6um_200403190144
 SCIMACNAL = 
 STRIP = 
 SYSIO = $(top_srcdir)/../libsysio
@@ -117,7 +118,7 @@ with_scamac =
 pkginclude_HEADERS = lustre_user.h liblustreapi.h
 subdir = include/lustre
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/portals/include/config.h
+CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 HEADERS = $(pkginclude_HEADERS)

diff --git a/lustre/include/lustre/Makefile.in b/lustre/include/lustre/Makefile.in
index e74b4ec..35f3178 100644 (file)
--- a/lustre/include/lustre/Makefile.in
+++ b/lustre/include/lustre/Makefile.in
@@ -77,6 +77,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
+CRAY_PORTALS_INCLUDE = @CRAY_PORTALS_INCLUDE@
 DEPDIR = @DEPDIR@
 ENABLE_DOC = @ENABLE_DOC@
 GMNAL = @GMNAL@
@@ -117,7 +118,7 @@ with_scamac = @with_scamac@
 pkginclude_HEADERS = lustre_user.h liblustreapi.h
 subdir = include/lustre
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/portals/include/config.h
+CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 HEADERS = $(pkginclude_HEADERS)