From 6dba7e8481037d3cf9f2135c6b49fb700258a208 Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Fri, 26 Oct 2018 13:25:37 +1000 Subject: [PATCH] Some fixes for make install --- GNUmakefile.debian | 6 ++++-- src/users.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/GNUmakefile.debian b/GNUmakefile.debian index f2f0bf1..8e67600 100644 --- a/GNUmakefile.debian +++ b/GNUmakefile.debian @@ -43,7 +43,7 @@ install: install -m755 -d ${DESTDIR}${datarootdir}/magicka/www/static/fonts install -m755 -d ${DESTDIR}${datarootdir}/magicka/menus - install -m755 magicka ${DESTDIR}${exec_prefix}/magicka + install -m755 magicka ${DESTDIR}${bindir}/magicka install -m755 utils/dosbox_shim/shim ${DESTDIR}${bindir}/magi_shim install -m755 utils/filecenter/filecenter ${DESTDIR}${bindir}/magi_filecenter install -m755 utils/magichat/magichat ${DESTDIR}${bindir}/magichat @@ -75,7 +75,7 @@ install: install -m644 dist/config/s10.ini ${DESTDIR}${sysconfdir}/magicka/s10.ini install -m644 dist/config/filesgen.ini ${DESTDIR}${sysconfdir}/magicka/filesgen.ini - sed -i "s@__LOCALSTATEPREFIX__@$${localstatedir}/magicka@g" config/filesgen.ini + sed -i "s@__LOCALSTATEPREFIX__@$${localstatedir}/magicka@g" ${DESTDIR}${sysconfdir}/magicka/filesgen.ini install -m644 dist/config/happynet.ini ${DESTDIR}${sysconfdir}/magicka/happynet.ini @@ -88,6 +88,8 @@ install: sed -i "s@__LOCALSTATEPREFIX__@${localstatedir}/magicka@g" ${DESTDIR}${bindir}/magiedit.sh sed -i "s@__EXECPREFIX__@${bindir}@g" ${DESTDIR}${bindir}/magiedit.sh + install -m644 dist/magicka.strings ${DESTDIR}${datarootdir}/magicka/magicka.strings + install -m644 dist/scripts/doors.lua ${DESTDIR}${datarootdir}/magicka/scripts/doors.lua install -m644 dist/scripts/filemenu.lua ${DESTDIR}${datarootdir}/magicka/scripts/filemenu.lua install -m644 dist/scripts/login_stanza.lua ${DESTDIR}${datarootdir}/magicka/scripts/login_stanza.lua diff --git a/src/users.c b/src/users.c index 5a2cd96..9368c72 100644 --- a/src/users.c +++ b/src/users.c @@ -778,7 +778,7 @@ struct user_record *new_user() { user->sec_level = conf.newuserlvl; user->bwavepktno = 0; user->sec_info = (struct sec_level_t *)malloz(sizeof(struct sec_level_t)); - snprintf(buffer, PATH_MAX, "%s/config/s%d.ini", conf.bbs_path, user->sec_level); + snprintf(buffer, PATH_MAX, "%s/s%d.ini", conf.config_path, user->sec_level); if (ini_parse(buffer, secLevel, user->sec_info) < 0) { dolog("Unable to load sec Level ini (%s)!", buffer);