From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 1 Jul 2011 16:00:14 +0000 (+0200)
Subject: Use local include paths instead of relative to $top_builddir/src
X-Git-Tag: v0.7.9~254
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92efa5453a2ef28d579a561c9188f428e2ea3ec;p=pspp-builds.git

Use local include paths instead of relative to $top_builddir/src

The old method appeared not to work with some gcc versions.
---

diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 1736ab80..84236b8c 100644
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "language/expressions/evaluate.h"
+#include "evaluate.h"
 
 #include <ctype.h>
 
diff --git a/src/language/expressions/optimize.c b/src/language/expressions/optimize.c
index 8f090778..a926997d 100644
--- a/src/language/expressions/optimize.c
+++ b/src/language/expressions/optimize.c
@@ -26,7 +26,7 @@
 #include "data/calendar.h"
 #include "data/data-in.h"
 #include "data/variable.h"
-#include "language/expressions/evaluate.h"
+#include "evaluate.h"
 #include "language/expressions/helpers.h"
 #include "language/expressions/public.h"
 #include "libpspp/assertion.h"
diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h
index 062d6f76..92adef85 100644
--- a/src/language/expressions/private.h
+++ b/src/language/expressions/private.h
@@ -21,8 +21,8 @@
 #include <stddef.h>
 
 #include "data/format.h"
-#include "language/expressions/operations.h"
-#include "language/expressions/public.h"
+#include "operations.h"
+#include "public.h"
 #include "libpspp/str.h"
 
 enum operation_flags