From d89fdb230b9160ea7b09cb29f2e7789025a32ee6 Mon Sep 17 00:00:00 2001
From: Maxim Biro <nurupo.contributions@gmail.com>
Date: Fri, 1 Jan 2016 01:17:19 -0500
Subject: [PATCH] Fix include paths

They are relative to the Makefile instead of the source file itself,
which is unintuitive and is messing with my IDE.
---
 build/Makefile.am                             |  2 +-
 other/bootstrap_daemon/{ => src}/Makefile.inc | 16 +++++++++-------
 other/bootstrap_daemon/src/tox-bootstrapd.c   | 12 +++++++-----
 3 files changed, 17 insertions(+), 13 deletions(-)
 rename other/bootstrap_daemon/{ => src}/Makefile.inc (90%)

diff --git a/build/Makefile.am b/build/Makefile.am
index c0e59645..ea844b3f 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -10,5 +10,5 @@ include ../toxencryptsave/Makefile.inc
 include ../toxav/Makefile.inc
 include ../other/Makefile.inc
 include ../testing/Makefile.inc
-include ../other/bootstrap_daemon/Makefile.inc
+include ../other/bootstrap_daemon/src/Makefile.inc
 include ../auto_tests/Makefile.inc
diff --git a/other/bootstrap_daemon/Makefile.inc b/other/bootstrap_daemon/src/Makefile.inc
similarity index 90%
rename from other/bootstrap_daemon/Makefile.inc
rename to other/bootstrap_daemon/src/Makefile.inc
index b278e3f0..a0d75fa0 100644
--- a/other/bootstrap_daemon/Makefile.inc
+++ b/other/bootstrap_daemon/src/Makefile.inc
@@ -3,16 +3,17 @@ if BUILD_DHT_BOOTSTRAP_DAEMON
 bin_PROGRAMS += tox-bootstrapd
 
 tox_bootstrapd_SOURCES = \
-                        ../other/bootstrap_daemon/src/tox-bootstrapd.c \
-                        ../other/bootstrap_daemon/src/log.c \
-                        ../other/bootstrap_daemon/src/log.h \
-                        ../other/bootstrap_daemon/src/config.h \
+                        ../other/bootstrap_daemon/src/command_line_arguments.c \
+                        ../other/bootstrap_daemon/src/command_line_arguments.h \
                         ../other/bootstrap_daemon/src/config.c \
                         ../other/bootstrap_daemon/src/config_defaults.h \
-                        ../other/bootstrap_node_packets.h \
+                        ../other/bootstrap_daemon/src/config.h \
+                        ../other/bootstrap_daemon/src/log.c \
+                        ../other/bootstrap_daemon/src/log.h \
+                        ../other/bootstrap_daemon/src/tox-bootstrapd.c \
                         ../other/bootstrap_node_packets.c \
-                        ../other/bootstrap_daemon/src/command_line_arguments.h \
-                        ../other/bootstrap_daemon/src/command_line_arguments.c
+                        ../other/bootstrap_node_packets.h
+
 
 tox_bootstrapd_CFLAGS = \
                         -I$(top_srcdir)/other/bootstrap_daemon \
@@ -32,5 +33,6 @@ endif
 
 EXTRA_DIST += \
     $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.conf \
+    $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.service \
     $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.sh
     
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index 45b7add0..4883f885 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -30,19 +30,21 @@
 #include <string.h>
 
 // toxcore
-#include "../../toxcore/LAN_discovery.h"
-#include "../../toxcore/onion_announce.h"
-#include "../../toxcore/TCP_server.h"
-#include "../../toxcore/util.h"
+#include "../../../toxcore/LAN_discovery.h"
+#include "../../../toxcore/onion_announce.h"
+#include "../../../toxcore/TCP_server.h"
+#include "../../../toxcore/util.h"
+
 
 // misc
-#include "../bootstrap_node_packets.h"
+#include "../../bootstrap_node_packets.h"
 
 #include "command_line_arguments.h"
 #include "config.h"
 #include "global.h"
 #include "log.h"
 
+
 #define SLEEP_MILLISECONDS(MS) usleep(1000*MS)
 
 // Uses the already existing key or creates one if it didn't exist