wmifs: Honor CONF Makefile variable when parsing system config files.
This commit is contained in:
parent
c16a5a9d8d
commit
ea884d8b78
|
@ -20,7 +20,7 @@ INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
|
|||
INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
|
||||
|
||||
.c.o:
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
|
||||
$(CC) -DCONF=\"$(CONF)\" $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
|
||||
|
||||
wmifs: $(OBJS)
|
||||
$(CC) $(LDFLAGS) -o wmifs $^ $(LIBS)
|
||||
|
|
|
@ -460,7 +460,7 @@ void wmifs_routine(int argc, char **argv)
|
|||
#endif
|
||||
|
||||
/* Scan throught the .rc files */
|
||||
parse_rcfile("/etc/wmifsrc", wmifs_keys);
|
||||
parse_rcfile(CONF"/wmifsrc", wmifs_keys);
|
||||
|
||||
p = getenv("HOME");
|
||||
if (p == NULL || *p == 0) {
|
||||
|
@ -471,7 +471,7 @@ void wmifs_routine(int argc, char **argv)
|
|||
strcat(temp, "/.wmifsrc");
|
||||
parse_rcfile(temp, wmifs_keys);
|
||||
|
||||
parse_rcfile("/etc/wmifsrc.fixed", wmifs_keys);
|
||||
parse_rcfile(CONF"/wmifsrc.fixed", wmifs_keys);
|
||||
|
||||
/* set user-defined colors */
|
||||
if (color[0] != 0) {
|
||||
|
|
Loading…
Reference in a new issue