From 63438cea6d78af796c35cf36698629e81aa09be2 Mon Sep 17 00:00:00 2001
From: Andrew Pamment <apamment@yandex.com>
Date: Fri, 26 Oct 2018 14:20:45 +1000
Subject: [PATCH] More fixes for make install

---
 GNUmakefile.debian         | 13 +++++++++++--
 src/GNUmakefile.debian     |  5 +----
 utils/magiedit/GNUmakefile |  3 ++-
 utils/magiedit/main.c      |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/GNUmakefile.debian b/GNUmakefile.debian
index 2915375..fe1a9b2 100644
--- a/GNUmakefile.debian
+++ b/GNUmakefile.debian
@@ -18,10 +18,10 @@ all:	magicka
 .PHONY: magicka www clean cleanwww install
 
 magicka:
-	cd src && $(MAKE) -f GNUmakefile.debian
+	cd src && $(MAKE) -f GNUmakefile.debian MAGIEDIT_ANSI_PATH="$(datarootdir)/magicka/ansis/" MAGIEDIT_DRAFT_PATH="$(datarootdir)/magicka/ansis/"
 
 www:
-	cd src && $(MAKE) -f GNUmakefile.debian www
+	cd src && $(MAKE) -f GNUmakefile.debian MAGIEDIT_ANSI_PATH="$(datarootdir)/magicka/ansis/" MAGIEDIT_DRAFT_PATH="$(datarootdir)/magicka/ansis/" www
 
 clean:
 	cd src && $(MAKE) -f GNUmakefile.debian clean
@@ -141,3 +141,12 @@ install:
 	install -m644 dist/menus/file.mnu ${DESTDIR}${datarootdir}/magicka/menus/file.mnu
 	install -m644 dist/menus/logoff.mnu ${DESTDIR}${datarootdir}/magicka/menus/logoff.mnu
 	install -m644 dist/menus/mail.mnu ${DESTDIR}${datarootdir}/magicka/menus/mail.mnu
+
+	echo "You should now create a user to run magicka"
+	echo "and assuming that user is magicka:
+	echo " "
+	echo "   chown -R magicka:magicka ${datarootdir}/magicka/scripts/data"
+	echo "   chown -R magicka:magicka ${localstatedir}/magicka"
+	echo " "
+	echo "Then configure ${sysconfdir}/magicka/bbs.ini to your liking"
+	
diff --git a/src/GNUmakefile.debian b/src/GNUmakefile.debian
index 70d80b2..bb16c7e 100644
--- a/src/GNUmakefile.debian
+++ b/src/GNUmakefile.debian
@@ -1,5 +1,5 @@
 CC:=			cc
-CFLAGS:=		-std=gnu99 -I/usr/local/include -ggdb
+CFLAGS:=		-std=gnu99 -I/usr/local/include
 LIBS:=			-L/usr/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -lmosquitto
 EXTRAOBJS:=     strlcpy/strlcpy.o strlcpy/strlcat.o
 
@@ -8,7 +8,4 @@ LIBTOOLIZE:=    libtoolize
 DEPS_LUA_TARGET:=	linux
 DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
 
-MAGIEDIT_ANSI_PATH:= "$(datarootdir)/magicka/ansis/"
-MAGIEDIT_DRAFT_PATH:= "$(localstatedir)/magicka/"
-
 include GNUmakefile.common
diff --git a/utils/magiedit/GNUmakefile b/utils/magiedit/GNUmakefile
index d295615..d7c8ed9 100644
--- a/utils/magiedit/GNUmakefile
+++ b/utils/magiedit/GNUmakefile
@@ -1,9 +1,10 @@
 CC=cc
-CFLAGS=-I../../deps/odoors/
+CFLAGS=-I../../deps/odoors/ -DANSI_PATH="\"$(ANSI_PATH)\"" -DDRAFT_PATH="\"$(DRAFT_PATH)\""
 DEPS = main.c
 OS = $(shell uname -s)
 ODOORS = ../../deps/odoors/libs-${OS}/libODoors.a
 
+
 ifeq ($(OS), SunOS)
 	EXTRA_LIBS = -lsocket
 endif
diff --git a/utils/magiedit/main.c b/utils/magiedit/main.c
index 107e05a..03059ea 100644
--- a/utils/magiedit/main.c
+++ b/utils/magiedit/main.c
@@ -451,7 +451,7 @@ char *message_editor() {
 						}
 
 						// write 	
-						snprintf(draft_path, PATH_MAX, "drafts/%s/%s.draft", od_control_get()->user_name, draft_filename);
+						snprintf(draft_path, PATH_MAX, DRAFT_PATH "drafts/%s/%s.draft", od_control_get()->user_name, draft_filename);
 					    fptr = fopen(draft_path, "w");
 
 						if (!fptr) {
@@ -501,7 +501,7 @@ char *message_editor() {
 				} else if (ch.chKeyPress == OD_KEY_F10) {
 					// load draft
 					if (load_draft() != NULL) {
-						snprintf(draft_path, PATH_MAX, "drafts/%s/%s.draft", od_control_get()->user_name, draft_filename);
+						snprintf(draft_path, PATH_MAX, DRAFT_PATH "drafts/%s/%s.draft", od_control_get()->user_name, draft_filename);
 					    fptr = fopen(draft_path, "r");
 					    if (!fptr) {
 							// error loading draft