From 7a4a0243bd0a97abd0f231269c4265e0b1fa7712 Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Sat, 6 Sep 2014 10:44:52 -0400
Subject: [PATCH] Fix out of source builds

Fixes #1018
---
 plugins/perl/Makefile.am      | 2 +-
 src/common/Makefile.am        | 4 ++--
 src/common/dbus/Makefile.am   | 2 +-
 src/common/dbus/dbus-client.c | 4 ++--
 src/common/dbus/dbus-plugin.c | 2 +-
 src/common/hexchat.h          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/perl/Makefile.am b/plugins/perl/Makefile.am
index 2b6b8ace..79621549 100644
--- a/plugins/perl/Makefile.am
+++ b/plugins/perl/Makefile.am
@@ -15,4 +15,4 @@ CLEANFILES = hexchat.pm.h irc.pm.h
 hexchat.pm.h irc.pm.h: lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm \
 	lib/HexChat/List/Network.pm lib/HexChat/List/Network/Entry.pm \
 	lib/HexChat/List/Network/AutoJoin.pm lib/IRC.pm
-	perl generate_header
+	cd $(srcdir); perl generate_header
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index b5ffe1ce..00fac49b 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES = libhexchatcommon.a
 
-AM_CPPFLAGS = $(COMMON_CFLAGS)
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(top_srcdir)
 
 EXTRA_DIST = \
 	cfgfiles.h \
@@ -70,7 +70,7 @@ libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS)
 textenums.h: textevents.h
 
 textevents.h: $(srcdir)/textevents.in make-te
-	$(AM_V_GEN) ./make-te < $< > $@ 2> textenums.h
+	$(AM_V_GEN) $(srcdir)/make-te < $< > $@ 2> textenums.h
 
 marshal.h: $(srcdir)/marshalers.list
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_hexchat_marshal --header $< > $@
diff --git a/src/common/dbus/Makefile.am b/src/common/dbus/Makefile.am
index 4fa30452..11b5d77d 100644
--- a/src/common/dbus/Makefile.am
+++ b/src/common/dbus/Makefile.am
@@ -15,7 +15,7 @@ BUILT_SOURCES =				\
 
 CLEANFILES = $(BUILT_SOURCES)
 
-AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS)
+AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS) -I$(top_srcdir)/src/common
 
 noinst_PROGRAMS = example
 example_SOURCES = example.c
diff --git a/src/common/dbus/dbus-client.c b/src/common/dbus/dbus-client.c
index 3babe78f..e507883d 100644
--- a/src/common/dbus/dbus-client.c
+++ b/src/common/dbus/dbus-client.c
@@ -22,8 +22,8 @@
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <dbus/dbus-glib.h>
 #include "dbus-client.h"
-#include "../hexchat.h"
-#include "../hexchatc.h"
+#include "hexchat.h"
+#include "hexchatc.h"
 
 #define DBUS_SERVICE "org.hexchat.service"
 #define DBUS_REMOTE "/org/hexchat/Remote"
diff --git a/src/common/dbus/dbus-plugin.c b/src/common/dbus/dbus-plugin.c
index ce079982..ee8accfe 100644
--- a/src/common/dbus/dbus-plugin.c
+++ b/src/common/dbus/dbus-plugin.c
@@ -25,7 +25,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib/gi18n.h>
-#include "../hexchat-plugin.h"
+#include "hexchat-plugin.h"
 
 #define PNAME _("remote access")
 #define PDESC _("plugin for remote access using DBUS")
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index c0a7d253..bbf32da5 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "../../config.h"
+#include "config.h"
 
 #include <glib.h>
 #include <glib/gstdio.h>