From 52e83c7afde624bf639828e1cb811ca83ef1d1dc Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Tue, 22 May 2001 17:49:18 -0400
Subject: BUG: do not include /usr/lib in -L

---
 Source/cmUnixMakefileGenerator.cxx | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx
index ff3d29e..fc5203b 100644
--- a/Source/cmUnixMakefileGenerator.cxx
+++ b/Source/cmUnixMakefileGenerator.cxx
@@ -243,14 +243,18 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout,
   for(std::vector<std::string>::iterator libDir = libdirs.begin();
       libDir != libdirs.end(); ++libDir)
     { 
-    std::string::size_type pos = libDir->find("-L");
-    if((pos == std::string::npos || pos > 0)
-       && libDir->find("${") == std::string::npos)
+    std::string libpath = cmSystemTools::EscapeSpaces(libDir->c_str());
+    if(libpath != "/usr/lib")
       {
-      linkLibs += "-L";
+      std::string::size_type pos = libDir->find("-L");
+      if((pos == std::string::npos || pos > 0)
+         && libDir->find("${") == std::string::npos)
+        {
+        linkLibs += "-L";
+        }
+      linkLibs += libpath;
+      linkLibs += " ";
       }
-    linkLibs += cmSystemTools::EscapeSpaces(libDir->c_str());
-    linkLibs += " ";
     }
   std::string librariesLinked;
   const cmTarget::LinkLibraries& libs = tgt.GetLinkLibraries();
@@ -273,9 +277,13 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout,
       std::string dir, file;
       cmSystemTools::SplitProgramPath(lib->first.c_str(),
                                       dir, file);
-      linkLibs += "-L";
-      linkLibs += cmSystemTools::EscapeSpaces(dir.c_str());
-      linkLibs += " ";
+      std::string libpath = cmSystemTools::EscapeSpaces(dir.c_str());
+      if(libpath != "/usr/lib")
+        {
+        linkLibs += "-L";
+        linkLibs += libpath;
+        linkLibs += " ";
+        }
       librariesLinked += "-l";
       cmRegularExpression libname("lib(.*)\\.(.*)");
       if(libname.find(file))
-- 
cgit v0.12