From ba95eab71fe5398577ae711d6c9c0741c58ecdeb Mon Sep 17 00:00:00 2001
From: Christian Kamm <kamm@incasoftware.de>
Date: Sun, 10 May 2009 17:58:09 +0200
Subject: [PATCH] In config file: replace %%ldcbinarypath%% with the path to
 the ldc executable.

---
 gen/configfile.cpp | 13 +++++++++++--
 ldc.conf.in        |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gen/configfile.cpp b/gen/configfile.cpp
index c318f231..30dd4605 100644
--- a/gen/configfile.cpp
+++ b/gen/configfile.cpp
@@ -88,8 +88,17 @@ bool ConfigFile::read(const char* argv0, void* mainAddr, const char* filename)
             int len = arr.getLength();
             for (int i=0; i<len; i++)
             {
-                const char* v = arr[i];
-                switches.push_back(v);
+                std::string v = arr[i];
+                
+                // replace binpathkey with binpath
+                std::string binpathkey = "%%ldcbinarypath%%";
+                sys::Path binpathgetter = sys::Path::GetMainExecutable(argv0, mainAddr);
+                binpathgetter.eraseComponent();
+                std::string binpath = binpathgetter.toString();
+                size_t p;
+                while (std::string::npos != (p = v.find(binpathkey)))
+                    v.replace(p, binpathkey.size(), binpath);
+                switches.push_back(strdup(v.c_str()));
             }
         }
 
diff --git a/ldc.conf.in b/ldc.conf.in
index e5ee1bd2..cb7db01c 100644
--- a/ldc.conf.in
+++ b/ldc.conf.in
@@ -9,7 +9,7 @@ default:
     switches = [
         "-I@RUNTIME_DIR@",
         "-I@RUNTIME_DIR@/lib/common",
-        "-L-L@PROJECT_BINARY_DIR@/../lib",
+        "-L-L%%ldcbinarydir%%/../lib",
         "-d-version=Tango",
         "-defaultlib=@RUNTIME_AIO@",
         "-debuglib=@RUNTIME_AIO@"