--- Source/cmLocalVisualStudio7Generator.cxx	2007-01-10 13:03:42.000000000 +0100
+++ Source/cmLocalVisualStudio7Generator.cxx	2007-01-30 13:54:51.265625000 +0100
@@ -48,6 +48,15 @@
   this->OutputVCProjFile();
 }
 
+std::string cmLocalVisualStudio7Generator::GetPdbName(cmTarget &tgt, const char *configName)
+{
+  std::string pdbPrefix;
+  std::string pdbBase;
+  std::string targetSuffix;
+  tgt.GetFullName(pdbPrefix, pdbBase, targetSuffix, configName);
+  return pdbPrefix + pdbBase + ".pdb";
+}
+
 void cmLocalVisualStudio7Generator::FixGlobalTargets()
 {
   // Visual Studio .NET 2003 Service Pack 1 will not run post-build
@@ -567,7 +576,7 @@
     {
     fout <<  "\t\t\t\tProgramDataBaseFileName=\""
          << this->LibraryOutputPath
-         << "$(OutDir)/" << libName << ".pdb\"\n";
+         << "$(OutDir)/" << this->GetPdbName(target, configName) << "\"\n";
     }
   fout << "/>\n";  // end of <Tool Name=VCCLCompilerTool
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCCustomBuildTool\"/>\n";
@@ -813,8 +822,7 @@
     this->OutputModuleDefinitionFile(fout, target);
     temp = this->LibraryOutputPath;
     temp += "$(OutDir)/";
-    temp += libName;
-    temp += ".pdb";
+    temp += this->GetPdbName(target, configName);
     fout << "\t\t\t\tProgramDataBaseFile=\"" <<
       this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
     if(strcmp(configName, "Debug") == 0
--- Source/cmLocalVisualStudio7Generator.h	2007-01-10 13:03:42.000000000 +0100
+++ Source/cmLocalVisualStudio7Generator.h	2007-01-30 13:32:20.156250000 +0100
@@ -65,6 +65,7 @@
   void SetPlatformName(const char* n) { this->PlatformName = n;}
   virtual void ConfigureFinalPass();
 private:
+  static std::string GetPdbName(cmTarget &tgt, const char *configName);
   void FillFlagMapFromCommandFlags(std::map<cmStdString, 
                                    cmStdString>& flagMap,
                                    cmVS7FlagTable* flagTable,