- Fix objdir != srcdir build problem

- Remove unused variable from b_1414

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index e871d9a..95b3474 100644 (file)
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -3,8 +3,8 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-# ../ for <portals/*.h>, ../../ for <config.h>
-COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I$(srcdir)/../../include
+# $(srcdir)/../ for <portals/*.h>, ../../ for generated <config.h>
+COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
 LINK = $(CC) -o $@
 
 if LIBLUSTRE

diff --git a/lustre/portals/utils/Makefile.am b/lustre/portals/utils/Makefile.am
index e871d9a..95b3474 100644 (file)
--- a/lustre/portals/utils/Makefile.am
+++ b/lustre/portals/utils/Makefile.am
@@ -3,8 +3,8 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-# ../ for <portals/*.h>, ../../ for <config.h>
-COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I$(srcdir)/../../include
+# $(srcdir)/../ for <portals/*.h>, ../../ for generated <config.h>
+COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
 LINK = $(CC) -o $@
 
 if LIBLUSTRE

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index 238001c..ab354af 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -86,7 +86,6 @@ static int lfs_setstripe(int argc, char **argv)
         long st_size;
         int  st_offset, st_count;
         char *end;
-        struct stat statbuf;
 
         if (argc != 5)
                 return CMD_HELP;