[cmake-commits] king committed cmGlobalUnixMakefileGenerator3.cxx 1.110 1.111

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13039

Modified Files:
	cmGlobalUnixMakefileGenerator3.cxx 
Log Message:
BUG: Quick-fix for accidental commit.


Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- cmGlobalUnixMakefileGenerator3.cxx	2 Aug 2007 18:23:46 -0000	1.110
+++ cmGlobalUnixMakefileGenerator3.cxx	2 Aug 2007 18:28:00 -0000	1.111
@@ -850,7 +850,7 @@
                         t->second.GetName(), depends, commands, true);
       
       // Add rules to prepare the target for installation.
-      if(!exclude && t->second.NeedRelinkBeforeInstall())
+      if(t->second.NeedRelinkBeforeInstall())
         {
         localName = lg->GetRelativeTargetDirectory(t->second);
         localName += "/preinstall";
@@ -861,11 +861,14 @@
         lg->WriteMakeRule(ruleFileStream, 
                           "Pre-install relink rule for target.",
                           localName.c_str(), depends, commands, true);
-        depends.clear();
-        depends.push_back(localName);
-        commands.clear();
-        lg->WriteMakeRule(ruleFileStream, "Prepare target for install.",
-                          "preinstall", depends, commands, true);
+        if(!exclude)
+          {
+          depends.clear();
+          depends.push_back(localName);
+          commands.clear();
+          lg->WriteMakeRule(ruleFileStream, "Prepare target for install.",
+                            "preinstall", depends, commands, true);
+          }
         }
       
       // add the clean rule