rpms/nant/devel nant-app.patch,1.2,1.3
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Sat Sep 16 21:07:05 UTC 2006
Author: pfj
Update of /cvs/extras/rpms/nant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28712
Modified Files:
nant-app.patch
Log Message:
Corrected patch file
nant-app.patch
nant-app.patch:
Index: nant-app.patch
===================================================================
RCS file: /cvs/extras/rpms/nant/devel/nant-app.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nant-app.patch 16 Sep 2006 12:03:35 -0000 1.2
+++ nant-app.patch 16 Sep 2006 21:07:05 -0000 1.3
@@ -5,7 +5,7 @@
sdkdirectory="${sdkDirectory}"
frameworkdirectory="${frameworkDirectory}"
- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}"
-+ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}"
++ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}"
clrversion="1.1.4322"
>
<task-assemblies>
@@ -15,8 +15,8 @@
<!-- in Mono 1.0.x, only mcs and mbas are located in <install root>\lib\mono\<profile> -->
- <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mcs.exe')}" />
- <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}" />
-+ <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mcs.exe')}" />
-+ <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mbas.exe')}" />
++ <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mcs.exe')}" />
++ <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mbas.exe')}" />
<!-- /doc is not supported in Mono 1.0.x -->
<property name="csc.supportsdocgeneration" value="false" />
@@ -26,8 +26,8 @@
-->
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
-+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
-+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
<if test="${not file::exists(runtimeEngine)}">
@@ -36,7 +36,7 @@
sdkdirectory="${sdkDirectory}"
frameworkdirectory="${frameworkDirectory}"
- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
-+ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50727"
>
<task-assemblies>
@@ -46,13 +46,13 @@
<!--
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
-+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
-+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
-->
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
-+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
-+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
<if test="${not file::exists(runtimeEngine)}">
@@ -60,7 +60,7 @@
</if>
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
-+ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -69,7 +69,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -78,7 +78,7 @@
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -87,7 +87,7 @@
sdkdirectory="${sdkDirectory}"
frameworkdirectory="${frameworkDirectory}"
- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
-+ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50215"
>
<task-assemblies>
@@ -97,13 +97,13 @@
<!--
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
-+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
-+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
-->
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
-+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
-+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
<if test="${not file::exists(runtimeEngine)}">
@@ -111,7 +111,7 @@
</if>
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
-+ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -120,7 +120,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -129,7 +129,7 @@
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -138,7 +138,7 @@
sdkdirectory="${sdkDirectory}"
frameworkdirectory="${frameworkDirectory}"
- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
-+ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.40607"
>
<task-assemblies>
@@ -148,13 +148,13 @@
<!--
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
-+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
-+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
-->
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
-+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
-+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
<if test="${not file::exists(runtimeEngine)}">
@@ -162,7 +162,7 @@
</if>
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
-+ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -171,7 +171,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -180,7 +180,7 @@
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -189,7 +189,7 @@
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/1.0')}"
-+ frameworkassemblydirectory="${path::combine(prefix, 'lib64/mono/1.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/1.0')}"
clrversion="1.1.4322"
>
<task-assemblies>
@@ -198,7 +198,7 @@
</if>
<if test="${pkg-config::is-atleast-version('mono', '1.1')}">
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
-+ <property name="frameworkdirectory" value="${path::combine(prefix, 'lib64/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<property name="resgen.tool" value="resgen" />
<property name="csc.supportsdocgeneration" value="true" />
</if>
@@ -207,7 +207,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -216,7 +216,7 @@
</task>
<task name="vbc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -225,7 +225,7 @@
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
-+ frameworkassemblydirectory="${path::combine(prefix, 'lib64/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50727"
>
<task-assemblies>
@@ -234,10 +234,10 @@
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
-+ <property name="frameworkdirectory" value="${path::combine(prefix, 'lib64/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
-+ <property name="resgen.tool" value="${path::combine(prefix, 'lib64/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -246,7 +246,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, 'lib64/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -255,7 +255,7 @@
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -264,7 +264,7 @@
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
-+ frameworkassemblydirectory="${path::combine(prefix, 'lib64/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50215"
>
<task-assemblies>
@@ -273,10 +273,10 @@
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
-+ <property name="frameworkdirectory" value="${path::combine(prefix, 'lib64/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
-+ <property name="resgen.tool" value="${path::combine(prefix, 'lib64/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -285,7 +285,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, 'lib64/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -294,7 +294,7 @@
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -303,7 +303,7 @@
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
-+ frameworkassemblydirectory="${path::combine(prefix, 'lib64/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.40607"
>
<task-assemblies>
@@ -312,10 +312,10 @@
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
-+ <property name="frameworkdirectory" value="${path::combine(prefix, 'lib64/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
-+ <property name="resgen.tool" value="${path::combine(prefix, 'lib64/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -324,7 +324,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, 'lib64/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -333,7 +333,7 @@
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
More information about the scm-commits
mailing list