From 7a672cab30275c0a62d8a68e9c4049ef4222337e Mon Sep 17 00:00:00 2001
From: cybersphinx <chr.ohm@gmx.net>
Date: Tue, 7 Dec 2010 23:27:05 +0100
Subject: [PATCH] Fix includes for generated files.

---
 lib/script/chat_lexer.l | 4 ++--
 src/level_lexer.l       | 4 ++--
 src/message_lexer.l     | 4 ++--
 src/message_parser.y    | 8 ++++----
 src/scriptvals_parser.y | 4 ++--
 src/version.c           | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/script/chat_lexer.l b/lib/script/chat_lexer.l
index 2013a20ac..138c88cbe 100644
--- a/lib/script/chat_lexer.l
+++ b/lib/script/chat_lexer.l
@@ -28,8 +28,8 @@
 // FIXME: #include from src/
 #include "src/scriptfuncs.h"
 
-#include "script.h"
-#include "chat_processing.h"
+#include "lib/script/script.h"
+#include "lib/script/chat_processing.h"
 
 /* Get the Yacc definitions */
 #include "chat_parser.tab.h"
diff --git a/src/level_lexer.l b/src/level_lexer.l
index 4882bb998..30bcf79da 100644
--- a/src/level_lexer.l
+++ b/src/level_lexer.l
@@ -26,8 +26,8 @@
 #include "lib/framework/frame.h"
 #include "lib/framework/string_ext.h"
 
-#include "levels.h"
-#include "levelint.h"
+#include "src/levels.h"
+#include "src/levelint.h"
 
 // fwrite declared with warn_unused_result, resulting in mysterious errors in "%%" on some distros.
 static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return true; }
diff --git a/src/message_lexer.l b/src/message_lexer.l
index fffd93eb4..4dcae76bf 100644
--- a/src/message_lexer.l
+++ b/src/message_lexer.l
@@ -25,13 +25,13 @@
  */
 
 #include "lib/framework/frame.h"
-#include "messagedef.h"
+#include "src/messagedef.h"
 
 /* Get the Yacc definitions */
 #include "message_parser.tab.h"
 
 #include "lib/framework/lexer_input.h"
-#include "messagely.h"
+#include "src/messagely.h"
 
 // fwrite declared with warn_unused_result, resulting in mysterious errors in "%%" on some distros.
 static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return true; }
diff --git a/src/message_parser.y b/src/message_parser.y
index 3c0e9adce..54a637ce7 100644
--- a/src/message_parser.y
+++ b/src/message_parser.y
@@ -26,10 +26,10 @@
 #include "lib/framework/frame.h"
 #include "lib/framework/strres.h"
 #include "lib/framework/frameresource.h"
-#include "message.h"
-#include "messagedef.h"
-#include "messagely.h"
-#include "text.h"
+#include "src/message.h"
+#include "src/messagedef.h"
+#include "src/messagely.h"
+#include "src/text.h"
 
 extern void yyerror(const char* msg);
 void yyerror(const char* msg)
diff --git a/src/scriptvals_parser.y b/src/scriptvals_parser.y
index 0cad0020b..c162855dd 100644
--- a/src/scriptvals_parser.y
+++ b/src/scriptvals_parser.y
@@ -32,7 +32,7 @@
 #include "lib/script/script.h"
 #include "lib/sound/audio.h"
 
-#include "scriptvals.h"
+#include "src/scriptvals.h"
 #include "lib/framework/lexer_input.h"
 #include "scriptvals_parser.tab.h"
 #include "src/scripttabs.h"
@@ -42,7 +42,7 @@
 #include "src/message.h"
 #include "src/levels.h"
 #include "src/research.h"
-#include "text.h"
+#include "src/text.h"
 
 // The current script code
 static SCRIPT_CODE		*psCurrScript;
diff --git a/src/version.c b/src/version.c
index eefb97ad7..d1863c721 100644
--- a/src/version.c
+++ b/src/version.c
@@ -26,7 +26,7 @@
 #include "stringdef.h"
 
 #define SVN_AUTOREVISION_STATIC static
-#include "autorevision.h"
+#include "src/autorevision.h"
 
 #if (SVN_LOW_REV < SVN_REV)
 # define SVN_FULL_REV_STR "r" SVN_LOW_REV_STR ":" SVN_REV_STR