[ros-diffs] [mpiulachs] 30803: - Do not use module (name + extension) as default target if installname attribute is present , use the value of it inset.

Author: mpiulachs
Date: Tue Nov 27 03:56:25 2007
New Revision: 30803

URL: http://svn.reactos.org/svn/reactos?rev=30803&view=rev
Log:
- Do not use module (name + extension) as default target if installname attribute is
present , use the value of it inset.

Modified:
    trunk/reactos/tools/rbuild/module.cpp

Modified: trunk/reactos/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re…
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp (original)
+++ trunk/reactos/tools/rbuild/module.cpp Tue Nov 27 03:56:25 2007
@@ -283,11 +283,6 @@
 	else
 		extension = GetDefaultModuleExtension ();
 
-	output = new FileLocation ( GetTargetDirectoryTree (),
-	                            modulePath,
-	                            name + extension,
-	                            &moduleNode );
-
 	att = moduleNode.GetAttribute ( "unicode", false );
 	if ( att != NULL )
 	{
@@ -416,9 +411,20 @@
 		                             installbase ? installbase->value : "",
 		                             att->value,
 		                             &moduleNode );
-	}
-	else
+
+    	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 )