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 1736ab80e8f8b942832bf490875b2568279fb87f..84236b8c9f76d17a72820b733bea6b6a11f34c52 100644 (file)
--- 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 8f090778ab9c80a20fc6f44a24e7a7ba5b5d21aa..a926997d93bae1ac557fb4ec667d5b6a2694c0eb 100644 (file)
--- 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 062d6f765185be6de3145397e4c30e7ae212394c..92adef85b3f401429964ba808c3fa3d3c24c1360 100644 (file)
--- 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