Merge pull request #5062 from MartinNowak/fixInifile

fix wrong SYSCONFDIR (dmd looked for /etc/dmd.conf/dmd.conf)
dlang · Sep 10, 2015 · 8c19631 · 8c19631
2 parents f407129 + b2e6b32
commit 8c19631
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/dinifile.d b/src/dinifile.d
@@ -38,7 +38,7 @@ extern (C++) const(char)* findConfFile(const(char)* argv0, const(char)* inifile)
      *      o home directory
      *      o exe directory (windows)
      *      o directory off of argv0
-     *      o SYSCONFDIR (default=/etc/) (non-windows)
+     *      o /etc (non-windows)
      */
     const(char)* filename = FileName.combine(getenv("HOME"), inifile);
     if (FileName.exists(filename))
@@ -82,9 +82,7 @@ extern (C++) const(char)* findConfFile(const(char)* argv0, const(char)* inifile)
                 return filename;
         }
         // Search /etc/ for inifile
-        enum SYSCONFDIR = "/etc/dmd.conf";
-        assert(SYSCONFDIR !is null && strlen(SYSCONFDIR));
-        filename = FileName.combine(SYSCONFDIR, inifile);
+        filename = FileName.combine("/etc", inifile);
     }
     // __linux__ || __APPLE__ || __FreeBSD__ || __OpenBSD__ || __sun
     return filename;

diff --git a/src/posix.mak b/src/posix.mak
@@ -19,8 +19,6 @@ else
 endif
 
 INSTALL_DIR=../../install
-# can be set to override the default /etc/
-SYSCONFDIR=/etc/
 PGO_DIR=$(abspath pgo)
 
 C=backend