[Iofsl-commits] branch, master, updated. merge-start-359-g3792058

[mysql vizuser]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".

The branch, master has been updated
       via  37920582b5b849c7c8f8eb08732313021837cb7d (commit)
      from  58015f342359ede0af334b8e0efdfecc6ee2c536 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 37920582b5b849c7c8f8eb08732313021837cb7d
Author: Dries Kimpe <dkimpe at mcs.anl.gov>
Date:   Fri Sep 6 19:08:01 2013 -0500

    Fix out-of-tree build

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Diff of changes:
diff --git a/Makefile.am b/Makefile.am
index 99b3b89..f26d0ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,11 @@ CPPCLIENTLIB =
 #   List all the .c / .h files
 CLIENTLIB =
 
-AM_CPPFLAGS = -I$(top_srcdir)/src \
+
+# need to have builddir here for files generated from .h.in
+AM_CPPFLAGS = -I${top_builddir}/src/zoidfs \
+	      -I${top_builddir}/src \
+	      -I$(top_srcdir)/src \
 	      -I$(top_srcdir)/src/iofwdutil \
 	      -I$(top_srcdir)/src/zoidfs \
 	      @BOOST_CPPFLAGS@ \


hooks/post-receive
--