RomanNum3ral
/
ly
mirror of https://github.com/fairyglade/ly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile: Add config option to allow specifying a separate data directory (#136) 

This allows the user to specify a different directory to store static files, such as
translations and other resources.

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
This commit is contained in:
Roosemberth Palacios 2019-10-27 16:49:55 +01:00 committed by nullgemm
parent 9486f05e59
commit fe4af2bfe6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
makefile
View File

@ -20,6 +20,9 @@ SUBD = sub
RESD = res RESD = res
TESTD = tests TESTD = tests
DATADIR ?= ${DESTDIR}/etc/ly
FLAGS+= -DDATADIR=\"$(DATADIR)\"
INCL = -I$(SRCD) INCL = -I$(SRCD)
INCL+= -I$(SUBD)/ctypes INCL+= -I$(SUBD)/ctypes
INCL+= -I$(SUBD)/argoat/src INCL+= -I$(SUBD)/argoat/src
@ -70,16 +73,17 @@ install: $(BIND)/$(NAME)
@echo "installing" @echo "installing"
@install -dZ ${DESTDIR}/etc/ly @install -dZ ${DESTDIR}/etc/ly
@install -DZ $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin
@install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}/etc/ly
@install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}/etc/ly
@install -DZ $(RESD)/config.ini -t ${DESTDIR}/etc/ly @install -DZ $(RESD)/config.ini -t ${DESTDIR}/etc/ly
@install -dZ ${DESTDIR}/etc/ly/lang @install -DZ $(RESD)/xsetup.sh -t $(DATADIR)
@install -DZ $(RESD)/lang/* -t ${DESTDIR}/etc/ly/lang @install -DZ $(RESD)/wsetup.sh -t $(DATADIR)
@install -dZ $(DATADIR)/lang
@install -DZ $(RESD)/lang/* -t $(DATADIR)/lang
@install -DZ $(RESD)/ly.service -t ${DESTDIR}/usr/lib/systemd/system @install -DZ $(RESD)/ly.service -t ${DESTDIR}/usr/lib/systemd/system
uninstall: uninstall:
@echo "uninstalling" @echo "uninstalling"
@rm -rf ${DESTDIR}/etc/ly @rm -rf ${DESTDIR}/etc/ly
@rm -rf $(DATADIR)
@rm -f ${DESTDIR}/usr/bin/ly @rm -f ${DESTDIR}/usr/bin/ly
@rm -f ${DESTDIR}/usr/lib/systemd/system/ly.service @rm -f ${DESTDIR}/usr/lib/systemd/system/ly.service

6
src/config.c
View File

@ -9,7 +9,7 @@
#include <unistd.h> #include <unistd.h>
#ifndef DEBUG #ifndef DEBUG
#define INI_LANG "/etc/ly/lang/%s.ini" #define INI_LANG DATADIR "/lang/%s.ini"
#define INI_CONFIG "/etc/ly/config.ini" #define INI_CONFIG "/etc/ly/config.ini"
#else #else
#define INI_LANG "../res/lang/%s.ini" #define INI_LANG "../res/lang/%s.ini"
@ -284,10 +284,10 @@ void config_defaults()
config.shutdown_cmd = strdup("/sbin/shutdown -a now"); config.shutdown_cmd = strdup("/sbin/shutdown -a now");
config.term_reset_cmd = strdup("/usr/bin/tput reset"); config.term_reset_cmd = strdup("/usr/bin/tput reset");
config.tty = 2; config.tty = 2;
config.wayland_cmd = strdup("/etc/ly/wsetup.sh"); config.wayland_cmd = strdup(DATADIR "/wsetup.sh");
config.waylandsessions = strdup("/usr/share/wayland-sessions"); config.waylandsessions = strdup("/usr/share/wayland-sessions");
config.x_cmd = strdup("/usr/bin/X"); config.x_cmd = strdup("/usr/bin/X");
config.x_cmd_setup = strdup("/etc/ly/xsetup.sh"); config.x_cmd_setup = strdup(DATADIR "/xsetup.sh");
config.xauth_cmd = strdup("/usr/bin/xauth"); config.xauth_cmd = strdup("/usr/bin/xauth");
config.xsessions = strdup("/usr/share/xsessions"); config.xsessions = strdup("/usr/share/xsessions");
} }