[Pkg-wmaker-commits] [wmifs] 88/118: wmifs: Honor CONF Makefile variable when parsing system config files.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmifs.

commit 00c8d4c5ba24889ba979dd81e989b3bc2810ff04
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Wed May 27 17:33:22 2015 -0500

    wmifs: Honor CONF Makefile variable when parsing system config files.
---
 Makefile | 2 +-
 wmifs.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmifs.git