From f26e31c660068d88c31df37f20da2510f5269199 Mon Sep 17 00:00:00 2001
From: Andrew Pamment <apamment@yandex.com>
Date: Fri, 26 Oct 2018 13:40:56 +1000
Subject: [PATCH] more fixes for make install

---
 GNUmakefile.debian         | 6 +++++-
 setup.sh                   | 2 +-
 src/GNUmakefile.debian     | 4 ++--
 utils/magiedit/magiedit.sh | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/GNUmakefile.debian b/GNUmakefile.debian
index 8e67600..2915375 100644
--- a/GNUmakefile.debian
+++ b/GNUmakefile.debian
@@ -136,4 +136,8 @@ install:
 	install -m644 dist/www-bootstrap/static/fonts/pxplus_ibm_vga8-webfont.woff ${DESTDIR}${datarootdir}/magicka/www/static/fonts/pxplus_ibm_vga8-webfont.woff
 	install -m644 dist/www-bootstrap/static/fonts/pxplus_ibm_vga8-webfont.woff2 ${DESTDIR}${datarootdir}/magicka/www/static/fonts/pxplus_ibm_vga8-webfont.woff2
 	
-	
+	install -m644 dist/menus/doors.mnu ${DESTDIR}${datarootdir}/magicka/menus/doors.mnu
+	install -m644 dist/menus/main.mnu ${DESTDIR}${datarootdir}/magicka/menus/main.mnu
+	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
diff --git a/setup.sh b/setup.sh
index 31316b6..307fab0 100755
--- a/setup.sh
+++ b/setup.sh
@@ -82,7 +82,7 @@ $SED -i "s@__LOCALSTATEPREFIX__@${PWD}@g" config/localmail.ini
 $SED -i "s@__LOCALSTATEPREFIX__@${PWD}@g" config/filesgen.ini
 $SED -i "s@__LOCALSTATEPREFIX__@${PWD}@g" config/happynet.ini
 $SED -i "s@__BINPREFIX__@${PWD}@g" utils/magiedit/magiedit.sh
-$SED -i "s@cd __LOCALSTATEPREFIX__/magiedit@cd ${PWD}/utils/magiedit/@g" utils/magiedit/magiedit.sh
+$SED -i "s@cd __LOCALSTATEPREFIX__@cd ${PWD}/utils/magiedit/@g" utils/magiedit/magiedit.sh
 $SED -i "s@__LOCALSTATEPREFIX__@${PWD}@g" utils/magiedit/magiedit.sh
 $SED -i "s@__EXECPREFIX__@.@g" utils/magiedit/magiedit.sh
 $SED -i "s@__SHAREPREFIX__@${PWD}@g" scripts/login_stanza.lua
diff --git a/src/GNUmakefile.debian b/src/GNUmakefile.debian
index 2ce730b..70d80b2 100644
--- a/src/GNUmakefile.debian
+++ b/src/GNUmakefile.debian
@@ -8,7 +8,7 @@ LIBTOOLIZE:=    libtoolize
 DEPS_LUA_TARGET:=	linux
 DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
 
-MAGIEDIT_ANSI_PATH:= "$(datarootdir)/magicka/ansis"
-MAGIEDIT_DRAFT_PATH:= "$(localstatedir)/magicka"
+MAGIEDIT_ANSI_PATH:= "$(datarootdir)/magicka/ansis/"
+MAGIEDIT_DRAFT_PATH:= "$(localstatedir)/magicka/"
 
 include GNUmakefile.common
diff --git a/utils/magiedit/magiedit.sh b/utils/magiedit/magiedit.sh
index e6b095f..ddb629b 100755
--- a/utils/magiedit/magiedit.sh
+++ b/utils/magiedit/magiedit.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-cd __LOCALSTATEPREFIX__/magiedit
+cd __LOCALSTATEPREFIX__
 __EXECPREFIX__/magiedit -D __LOCALSTATEPREFIX__/node$1/dorinfo1.def -MSGTMP __LOCALSTATEPREFIX__/node$1