mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-02 19:26:32 +00:00
- 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:
@@ -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 )
|
||||
|
||||
Reference in New Issue
Block a user