[PATCH 13/24] wmifs: Honor CONF Makefile variable when parsing system config files.

[Doug Torrance]

---
 wmifs/Makefile | 2 +-
 wmifs/wmifs.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wmifs/Makefile b/wmifs/Makefile
index e2d8986..e442ed3 100755
--- a/wmifs/Makefile
+++ b/wmifs/Makefile
@@ -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)
diff --git a/wmifs/wmifs.c b/wmifs/wmifs.c
index f6ee3a5..0f25456 100644
--- a/wmifs/wmifs.c
+++ b/wmifs/wmifs.c
@@ -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) {
-- 
2.1.4


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.