Fix VPATH builds

2 files changed, 3 insertions, 2 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 38182c5..e60f9b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,6 +58,7 @@ defaults.hh: Makefile
 
 defaults.cc: force
         @( \
+                GITDIR=$(top_srcdir)/.git; \
                 echo '#include "defaults.hh"'; \
                 echo ''; \
                 echo 'std::string realProgramName(const std::string& name) {'; \
@@ -65,7 +66,7 @@ defaults.cc: force
                 echo '}'; \
                 echo ''; \
                 echo 'const char* gitrevision() {'; \
-                echo '  return "'`cat ../.git/$$(cat ../.git/HEAD | cut -f 2 -d ' ')`'";';\
+                echo '  return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";';\
                 echo '}' ) > defaults_tmp.cc
         @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
         @rm defaults_tmp.cc
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 1b82135..53e1ddc 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I..
+INCLUDES= -I$(top_srcdir)/src
 
 noinst_PROGRAMS= \
          testTexture \