Fix Tox/toxic#222 and reorganize cfg dir

build/Makefile

@@ -2,8 +2,9 @@ TOXIC_VERSION = 0.4.7
 REV = $(shell git rev-list HEAD --count)
 VERSION = $(TOXIC_VERSION)_r$(REV)
 
-CFG_DIR = ../cfg
-SRC_DIR = ../src
+BASE_DIR = $(shell cd .. && pwd -P)
+CFG_DIR = $(BASE_DIR)/cfg
+SRC_DIR = $(BASE_DIR)/src
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 DATADIR = $(PREFIX)/share/toxic
@@ -49,7 +50,7 @@ ifneq ($(filter arm%, $(UNAME_M)),)
 endif
 
 # Include all needed checks
--include $(CFG_DIR)/check_features.mk
+-include $(CFG_DIR)/checks/check_features.mk
 
 # Targets
 all: toxic
@@ -68,7 +69,6 @@ clean:
 
 -include $(OBJ:.o=.d)
 
--include $(CFG_DIR)/install.mk
--include $(CFG_DIR)/help.mk
+-include $(CFG_DIR)/targets/*.mk
 
 .PHONY: clean all

cfg/checks/check_features.mk

@@ -1,3 +1,5 @@
+CHECKS_DIR = $(CFG_DIR)/checks
+
 # Check if we can use X11
 CHECK_X11_LIBS = $(shell pkg-config x11 || echo -n "error")
 ifneq ($(CHECK_X11_LIBS), error)
@@ -8,19 +10,19 @@ endif
 # Check if we want build audio support
 AUDIO = $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
 ifneq ($(AUDIO), disabled)
-	-include $(CFG_DIR)/av.mk
+	-include $(CHECKS_DIR)/av.mk
 endif
 
 # Check if we want build sound notifications support
 SND_NOTIFY = $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
 ifneq ($(SND_NOTIFY), disabled)
-	-include $(CFG_DIR)/sound_notifications.mk
+	-include $(CHECKS_DIR)/sound_notifications.mk
 endif
 
 # Check if we want build desktop notifications support
 DESK_NOTIFY = $(shell if [ -z "$(DISABLE_DESKTOP_NOTIFY)" ] || [ "$(DISABLE_DESKTOP_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
 ifneq ($(DESK_NOTIFY), disabled)
-	-include $(CFG_DIR)/desktop_notifications.mk
+	-include $(CHECKS_DIR)/desktop_notifications.mk
 endif
 
 # Check if we can build Toxic

cfg/systems/FreeBSD.mk

@@ -1,3 +1,4 @@
 # Specials options for freebsd systems
 LIBS := $(filter-out ncursesw, $(LIBS))
 LDFLAGS += -lncursesw
+MANDIR = $(PREFIX)/man

cfg/systems/Linux.mk

@@ -1,3 +1,4 @@
 # Specials options for linux systems
 CFLAGS +=
 LDFLAGS += -ldl -lresolv
+MANDIR = $(PREFIX)/share/man

cfg/targets/install.mk

@@ -1,6 +1,6 @@
-MISC_DIR = ../misc
-DOC_DIR = ../doc
-SND_DIR = ../sounds
+MISC_DIR = $(BASE_DIR)/misc
+DOC_DIR = $(BASE_DIR)/doc
+SND_DIR = $(BASE_DIR)/sounds
 DATAFILES = DHTnodes DNSservers toxic.conf.example
 MANFILES = toxic.1 toxic.conf.5
 SNDFILES = ContactLogsIn.wav ContactLogsOut.wav Error.wav IncomingCall.wav