From 78d2cfde69d217abc38b4aaebc57addd0b4fc161 Mon Sep 17 00:00:00 2001
From: Marc Piulachs <marc.piulachs@live.com>
Date: Tue, 27 Nov 2007 00:56:25 +0000
Subject: [PATCH] - 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
---
 reactos/tools/rbuild/module.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index dd49f7c7d78..3dd51bc804d 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -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 )