* localdir.cc (LocalDirSetting::LocalDirSetting): Restore -l option.

diff --git a/ChangeLog b/ChangeLog
index 415e748cabc211297abb9108fdc2fc045646e061..82c0742353cf7687d08d4612472763f4a0fd4a8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-04  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       * localdir.cc (LocalDirSetting::LocalDirSetting): Restore -l option.
+
 2009-11-04  Dave Korn  <dave.korn.cygwin@gmail.com>
 
        * site.cc: Add #include of BoolOption header from libgetopt.

diff --git a/localdir.cc b/localdir.cc
index 66e399748deb8ce18bdf134c6bc832cb789c872b..279cd452cbd28a560b63e46b1eb516724bd2a931 100644 (file)
--- a/localdir.cc
+++ b/localdir.cc
@@ -62,7 +62,9 @@ static ControlAdjuster::ControlInfo LocaldirControlsInfo[] = {
 LocalDirSetting::LocalDirSetting ()
 {
   const char *fg_ret;
-  if ((fg_ret = UserSettings::instance().get ("last-cache")))
+  if (std::string (LocalDirOption).size ())
+    local_dir = std::string (LocalDirOption);
+  else if ((fg_ret = UserSettings::instance().get ("last-cache")))
     local_dir = std::string (fg_ret);
 }