Browse Source

BUG: Quick-fix for accidental commit.

Brad King 18 years ago
parent
commit
695424f6b7
1 changed files with 9 additions and 6 deletions
  1. 9 6
      Source/cmGlobalUnixMakefileGenerator3.cxx

+ 9 - 6
Source/cmGlobalUnixMakefileGenerator3.cxx

@@ -850,7 +850,7 @@ cmGlobalUnixMakefileGenerator3
                         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 @@ cmGlobalUnixMakefileGenerator3
         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