snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmifs: Honor CONF Makefile variable when parsing system config files.

Browse source
This commit is contained in:
Doug Torrance 2015-05-27 17:33:22 -05:00 committed by Carlos R. Mafra
parent c16a5a9d8d
commit ea884d8b78
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wmifs/Makefile
View file

@ -20,7 +20,7 @@ INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
.c.o: .c.o:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o $(CC) -DCONF=\"$(CONF)\" $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
wmifs: $(OBJS) wmifs: $(OBJS)
$(CC) $(LDFLAGS) -o wmifs $^ $(LIBS) $(CC) $(LDFLAGS) -o wmifs $^ $(LIBS)

4
wmifs/wmifs.c
View file

@ -460,7 +460,7 @@ void wmifs_routine(int argc, char **argv)
#endif #endif
/* Scan throught the .rc files */ /* Scan throught the .rc files */
parse_rcfile("/etc/wmifsrc", wmifs_keys); parse_rcfile(CONF"/wmifsrc", wmifs_keys);
p = getenv("HOME"); p = getenv("HOME");
if (p == NULL || *p == 0) { if (p == NULL || *p == 0) {
@ -471,7 +471,7 @@ void wmifs_routine(int argc, char **argv)
strcat(temp, "/.wmifsrc"); strcat(temp, "/.wmifsrc");
parse_rcfile(temp, wmifs_keys); parse_rcfile(temp, wmifs_keys);
parse_rcfile("/etc/wmifsrc.fixed", wmifs_keys); parse_rcfile(CONF"/wmifsrc.fixed", wmifs_keys);
/* set user-defined colors */ /* set user-defined colors */
if (color[0] != 0) { if (color[0] != 0) {