- Do not use module (name + extension) as default target if installname attribute is present , use the value of it inset.

svn path=/trunk/; revision=30803
This commit is contained in:
Marc Piulachs
2007-11-27 00:56:25 +00:00
parent f31c48be7c
commit 78d2cfde69
+11 -5
View File
@@ -283,11 +283,6 @@ Module::Module ( const Project& project,
else
extension = GetDefaultModuleExtension ();
output = new FileLocation ( GetTargetDirectoryTree (),
modulePath,
name + extension,
&moduleNode );
att = moduleNode.GetAttribute ( "unicode", false );
if ( att != NULL )
{
@@ -416,9 +411,20 @@ Module::Module ( const Project& project,
installbase ? installbase->value : "",
att->value,
&moduleNode );
output = new FileLocation ( GetTargetDirectoryTree (),
modulePath,
att->value,
&moduleNode );
}
else
{
install = NULL;
output = new FileLocation ( GetTargetDirectoryTree (),
modulePath,
name + extension,
&moduleNode );
}
att = moduleNode.GetAttribute ( "allowwarnings", false );
if ( att == NULL )