--- a/buildframework/helium/tools/quality/conflict-checker.ant.xml	Wed Oct 28 14:39:48 2009 +0000
+++ b/buildframework/helium/tools/quality/conflict-checker.ant.xml	Wed Dec 23 19:29:07 2009 +0200
@@ -25,7 +25,7 @@
         Analyse the content created from two different components.
     </description>
 
-    <property name="build.duplicates.log" location="${build.log.dir}/${build.id}_build_duplicates.xml" />
+    <property name="build.duplicates.log" location="${temp.build.dir}/${build.id}_build_duplicates.xml" />
 
     <!--
         This macro extract the list of files generated/exported several time from different component 
@@ -55,15 +55,12 @@
        Check if the build duplicated needs to be run.
     -->
     <target name="check-build-duplicates">
-        <if>
+        <condition property="skip.build.duplicates" value="">
             <or>
                 <equals arg1="${build.system}" arg2="sbs" />
                 <equals arg1="${build.system}" arg2="sbs-ec" />
             </or>
-            <then>
-                <property name="skip.build.duplicates" value="" />
-            </then>
-        </if>
+        </condition>
     </target>
 
     <!-- Parse all the build log and extract files that are generated/exported
@@ -71,7 +68,7 @@
     -->
     <target name="integration-build-duplicates" depends="check-build-duplicates" unless="skip.build.duplicates">
         <hlm:checkBuildDuplicatesMacro output="${build.duplicates.log}">
-            <fileset dir="${build.log.dir}">
+            <fileset dir="${compile.log.dir}">
                 <include name="${build.id}.*_compile.log" />
                 <include name="${build.id}.what.cmaker.log" />
                 <exclude name="${build.id}.*_output_build.log" />