summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2007-08-02 18:28:00 (GMT)
committerBrad King <brad.king@kitware.com>2007-08-02 18:28:00 (GMT)
commit695424f6b7371c1980096a5b54cfaf6fdf7c9836 (patch)
tree7948386d1b5a8131201ca6c656b272dc8bd4fd8e /Source/cmGlobalUnixMakefileGenerator3.cxx
parent8b0575c4ceff0373cf9c014800276cba4db94fe2 (diff)
downloadCMake-695424f6b7371c1980096a5b54cfaf6fdf7c9836.zip
CMake-695424f6b7371c1980096a5b54cfaf6fdf7c9836.tar.gz
CMake-695424f6b7371c1980096a5b54cfaf6fdf7c9836.tar.bz2
BUG: Quick-fix for accidental commit.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx15
1 files changed, 9 insertions, 6 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 8d528a4..2dce017 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/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