From 695424f6b7371c1980096a5b54cfaf6fdf7c9836 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 2 Aug 2007 14:28:00 -0400 Subject: BUG: Quick-fix for accidental commit. --- Source/cmGlobalUnixMakefileGenerator3.cxx | 15 +++++++++------ 1 file 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 -- cgit v0.12