From 4fbe9a41fb025031d85400e0e730fd12be1f30e4 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 26 Mar 2010 23:22:46 +0100
Subject: Use property.location for compatible absolute path composition

---
 make/gluegen-cpptasks.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'make/gluegen-cpptasks.xml')

diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index dc88340..f569ea7 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -26,18 +26,20 @@
   <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar;${gluegen.root}/make/lib/CppTasksGCCNamespaceHack.jar"/>
 
   <condition property="gluegen-cpptasks.file"
-             value="${basedir}/${gluegen.root}/make/gluegen-cpptasks-base.xml">
+             value="${gluegen.root}/make/gluegen-cpptasks-base.xml">
     <not>
         <isset property="gluegen-cpptask.file" />
     </not>
   </condition>
 
+  <property name="gluegen-cpptasks.file.abs-path" location="${gluegen-cpptasks.file}" />
+
   <!--
   <echo message="gluegen-cpptasks.xml: gluegen.root          ${gluegen.root}"/>
-  <echo message="gluegen-cpptasks.xml: gluegen-cpptasks.file ${gluegen-cpptasks.file}"/>
+  <echo message="gluegen-cpptasks.xml: gluegen-cpptasks.file ${gluegen-cpptasks.file} -> ${gluegen-cpptasks.file.abs-path}"/>
   <echo message="gluegen-cpptasks.xml: basedir               ${basedir}"/>
   -->
 
-  <import file="${gluegen-cpptasks.file}" optional="false" />
+  <import file="${gluegen-cpptasks.file.abs-path}" optional="false" />
 
 </project>
-- 
cgit v1.2.3