* XamlG.cs (Execute): Fix earlier commit, include the filename.

svn path=/trunk/mcs/; revision=160488

diff --git a/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/ChangeLog b/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/ChangeLog
index 3997c5fcf3a2e3e41a1657ebfada383accd67073..f6220729048c7d7d077ffbb9679d32788a121585 100644 (file)
--- a/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/ChangeLog
+++ b/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-16  Ankit Jain  <jankit@novell.com>
+
+       * XamlG.cs (Execute): Fix earlier commit, include the filename.
+
 2010-07-16  Ankit Jain  <jankit@novell.com>
 
        * Respack.cs (Execute): Skip if output file is up-to-date wrt

diff --git a/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/XamlG.cs b/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/XamlG.cs
index a5f7b1a5fad835f1022c14968580b20371090da6..bacd62da2079a3d893810bce9f3d8753a1a832e2 100644 (file)
--- a/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/XamlG.cs
+++ b/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/XamlG.cs
@@ -67,7 +67,9 @@ namespace Moonlight.Build.Tasks {
                                        string full_source_path = source_item.GetMetadata ("FullPath");
                                        try {
                                                if (!XamlGCompiler.GenerateFile (codedom_provider, AssemblyName, full_source_path,
-                                                                               source_item.GetMetadata ("RelativeDir"), dest_item.ItemSpec, Log)) {
+                                                                               Path.Combine (source_item.GetMetadata ("RelativeDir"),
+                                                                                       Path.GetFileName (source_item.ItemSpec)),
+                                                                               dest_item.ItemSpec, Log)) {
                                                        Log.LogError ("Error generating {0} from {1}", full_source_path, dest_item.ItemSpec);
                                                        return false;
                                                }