From 271eb4c74de4c12e73deaa5669588e4e4bca8410 Mon Sep 17 00:00:00 2001
From: alalazo <massimiliano.culpo@googlemail.com>
Date: Thu, 14 Jul 2016 16:24:25 +0200
Subject: [PATCH] Enable out of source builds
---
examples/Makefile.am | 2 +-
src/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 22911e903e..1fedca0c38 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -19,7 +19,7 @@
MYFLAGS = -DTIMER
# Add the source directory and debug to CFLAGS
-AM_CFLAGS = -I../src $(HDF5_CPPFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/src $(HDF5_CPPFLAGS)
AM_LDFLAGS = $(HDF5_LDFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index bc263d6fb0..1f776a6af2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,12 +92,12 @@ version_string.h: version_string.h.in $(AM_SOURCES) $(include_HEADERS) $(noinst_
GIT_BRANCH=`$(GIT_CMD) branch | sed -n 's/^\* \(.*\)/\1/p'`; \
sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
-e "s,@GIT_REVISION\@,$${GIT_REVISION}," \
- -e "s|@GIT_BRANCH\@|$${GIT_BRANCH}|" version_string.h.in > version_string.h; \
+ -e "s|@GIT_BRANCH\@|$${GIT_BRANCH}|" $< > version_string.h; \
else \
if test ! -f version_string.h; then \
sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
-e "s,@GIT_REVISION\@,unknown," \
- -e "s,@GIT_BRANCH\@,unknown," version_string.h.in > version_string.h; \
+ -e "s,@GIT_BRANCH\@,unknown," $< > version_string.h; \
fi; \
fi
--
GitLab