Commit 695424f6 authored by Brad King's avatar Brad King
Browse files

BUG: Quick-fix for accidental commit.

parent 8b0575c4
...@@ -850,7 +850,7 @@ cmGlobalUnixMakefileGenerator3 ...@@ -850,7 +850,7 @@ cmGlobalUnixMakefileGenerator3
t->second.GetName(), depends, commands, true); t->second.GetName(), depends, commands, true);
// Add rules to prepare the target for installation. // Add rules to prepare the target for installation.
if(!exclude && t->second.NeedRelinkBeforeInstall()) if(t->second.NeedRelinkBeforeInstall())
{ {
localName = lg->GetRelativeTargetDirectory(t->second); localName = lg->GetRelativeTargetDirectory(t->second);
localName += "/preinstall"; localName += "/preinstall";
...@@ -861,11 +861,14 @@ cmGlobalUnixMakefileGenerator3 ...@@ -861,11 +861,14 @@ cmGlobalUnixMakefileGenerator3
lg->WriteMakeRule(ruleFileStream, lg->WriteMakeRule(ruleFileStream,
"Pre-install relink rule for target.", "Pre-install relink rule for target.",
localName.c_str(), depends, commands, true); localName.c_str(), depends, commands, true);
depends.clear(); if(!exclude)
depends.push_back(localName); {
commands.clear(); depends.clear();
lg->WriteMakeRule(ruleFileStream, "Prepare target for install.", depends.push_back(localName);
"preinstall", depends, commands, true); commands.clear();
lg->WriteMakeRule(ruleFileStream, "Prepare target for install.",
"preinstall", depends, commands, true);
}
} }
// add the clean rule // add the clean rule
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment