diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index dcab4cbe9e..200533d970 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1289,17 +1289,17 @@ void cmMakefile::ExpandVariables()
   for(std::vector<std::string>::iterator d = m_IncludeDirectories.begin();
       d != m_IncludeDirectories.end(); ++d)
     {
-    this->ExpandVariablesInString(*d);
+    this->ExpandVariablesInString(*d, true, true);
     }
   for(std::vector<std::string>::iterator d = m_LinkDirectories.begin();
       d != m_LinkDirectories.end(); ++d)
     {
-    this->ExpandVariablesInString(*d);
+    this->ExpandVariablesInString(*d, true, true);
     }
   for(cmTarget::LinkLibraries::iterator l = m_LinkLibraries.begin();
       l != m_LinkLibraries.end(); ++l)
     {
-    this->ExpandVariablesInString(l->first);
+    this->ExpandVariablesInString(l->first, true, true);
     }
 }
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b16f80cc45..33eaa9cd5b 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -240,7 +240,7 @@ void cmTarget::GenerateSourceFilesFromSourceLists( cmMakefile &mf)
   LinkLibraries::iterator p = m_LinkLibraries.begin();
   for (;p != m_LinkLibraries.end(); ++p)
     {
-    mf.ExpandVariablesInString(p->first);
+    mf.ExpandVariablesInString(p->first, true, true);
     }
 }