inifile: use SYSCONFDIR

dlang · Jan 5, 2014 · 5c61ce8 · 5c61ce8
1 parent 10de92b
commit 5c61ce8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/posix.mak b/posix.mak
@@ -1,4 +1,5 @@
 INSTALL_DIR=$(PWD)/../install
+SYSCONFDIR="/etc/"
 
 .PHONY: all clean test install
 

diff --git a/src/inifile.c b/src/inifile.c
@@ -34,6 +34,10 @@
 
 #define LOG     0
 
+#ifndef SYSCONFDIR
+#define SYSCONFDIR "/etc/"
+#endif
+
 char *skipspace(const char *p);
 
 
@@ -72,7 +76,7 @@ const char *inifile(const char *argv0x, const char *inifilex, const char *envsec
          *      o current directory
          *      o home directory
          *      o directory off of argv0
-         *      o /etc/
+         *      o SYSCONFDIR (default=/etc/)
          */
         if (FileName::exists(inifile))
         {
@@ -136,7 +140,7 @@ const char *inifile(const char *argv0x, const char *inifilex, const char *envsec
                     // Search /etc/ for inifile
                 Letc:
 #endif
-                    filename = (char *)FileName::combine((char *)"/etc/", inifile);
+                    filename = (char *)FileName::combine((char *)SYSCONFDIR, inifile);
 
                 Ldone:
                     ;

diff --git a/src/posix.mak b/src/posix.mak
@@ -436,7 +436,7 @@ import.o: import.c
 	$(CC) -c $(CFLAGS) $<
 
 inifile.o: inifile.c
-	$(CC) -c $(CFLAGS) $<
+	$(CC) -c $(CFLAGS) -DSYSCONFDIR='"$(SYSCONFDIR)"' $<
 
 init.o: init.c
 	$(CC) -c $(CFLAGS) $<