Commit f83f95d2 authored by Sevan Janiyan's avatar Sevan Janiyan
Browse files

Don't hardcode the path to chilli.conf.

Use a macro instead & translate that to the relevant path pointed to by
sysconfdir during the build process.

There remains 2 direct references to /etc for the sysconf directory but it's a
move in the right direction of #299 to be flexible.
parent 24da69b7
......@@ -17,6 +17,7 @@ $(chilli_SCRIPTS:=.in) chilli.conf.in defaults.in \
CoovaChilliLib.py.in gui-config-default.ini
edit = sed \
-e 's,@ETCDIR\@,$(sysconfdir),g' \
-e 's,@SBINDIR\@,$(sbindir),g' \
-e 's,@INITDIR\@,$(initrddir),g' \
-e 's,@VARTMP\@,$(localstatedir)/tmp,g' \
......
......@@ -29,7 +29,7 @@ MULTI=$(ls @ETCCHILLI@/*/chilli.conf 2>/dev/null)
}
pidfile=@VARRUN@/chilli.pid
CONFIG=/etc/chilli.conf
CONFIG=@ETCDIR@/chilli.conf
if [ -n "$DHCPIF" ]; then
CONFIG=@ETCCHILLI@/$DHCPIF/chilli.conf
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment