[tasque/xbuild] [xbuild] Fix output paths

[Antonius Riha <antoniusri src gnome org>]

commit 5c6d2d7f8f5eb38fecf8760a2feaf83c52da7fa3
Author: Antonius Riha <antoniusriha gmail com>
Date:   Wed Oct 3 12:32:21 2012 +0200

    [xbuild] Fix output paths

 build/X.Common.targets |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/build/X.Common.targets b/build/X.Common.targets
index 34b16f1..ed2f2e1 100644
--- a/build/X.Common.targets
+++ b/build/X.Common.targets
@@ -39,9 +39,6 @@
     <AutoInstall Condition=" '$(AltTarget)' != '' ">false</AutoInstall>
     
     <!-- Global dirs -->
-    <OutputPath>.</OutputPath>
-    <Prefix Condition=" '$(Prefix)' == '' ">$(MSBuildProjectDirectory)\$(RelPrefix)</Prefix>
-    
     <!-- Assume AbsTopBuildDir is the dir, where the sln resides -->
     <AbsTopBuildDir Condition=" '$(AbsTopBuildDir)' == '' ">$(SolutionDir)</AbsTopBuildDir>
     <!-- Assume AbsTopSrcDir is the same as AbsTopBuildDir (usually is) -->
@@ -55,6 +52,11 @@
     <PoBuildDir Condition=" '$(PoBuildDir)' == '' ">$(TopBuildDir)\po</PoBuildDir>
     <PoSrcDir Condition=" '$(PoSrcDir)' == '' ">$(TopSrcDir)\po</PoSrcDir>
     
+    <!-- Output paths for build and install -->
+    <OutputPath>.</OutputPath>
+    <!-- Prefix defaults to <top_level>/build/bin -->
+    <Prefix Condition=" '$(Prefix)' == '' ">$(AbsTopBuildDir)\build\bin</Prefix>
+
     <LibDir Condition=" '$(LibDir)' == '' ">$(Prefix)\lib</LibDir>
     <BinDir Condition=" '$(BinDir)' == '' ">$(Prefix)\bin</BinDir>
     <PkgLibDir Condition=" '$(PkgLibDir)' == '' ">$(LibDir)\$(PackageName)</PkgLibDir>