diff --git a/CMakeVariables.make.in b/CMakeVariables.make.in
index 8da8e23ae..8ed9d874b 100644
--- a/CMakeVariables.make.in
+++ b/CMakeVariables.make.in
@@ -73,7 +73,6 @@ THREAD_LIBS          = @CMAKE_THREAD_LIBS@
 # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
 # when installing files.
 INSTALL_ROOT    =
-INSTALL         = @CMAKE_INSTALL@
 LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
 BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
 
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index 6833a09bc..a17bcfa98 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -52,7 +52,22 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
   // Now check and see if the value has been stored in the cache
   // already, if so use that value and don't look for the program
   std::string helpString = "Where can the ";
-  helpString += args[1] + " library be found";
+  if(args[1] == "NAMES")
+    {
+    int i = 2;
+    while(args[i] != "PATHS" && i < args.size())
+      {
+      helpString = "( ";
+      helpString +=  args[i];
+      helpString +=  " ";
+      i++;
+      }
+    }
+  else
+    {
+    helpString += args[1];
+    }
+  helpString += " library be found";
   const char* cacheValue
     = cmCacheManager::GetInstance()->GetCacheValue(args[0].c_str());
   if(cacheValue && strcmp(cacheValue, "NOTFOUND"))