blob: 0ab424b0bd16cda79f16f5c23771b1837eb718c5 [file] [log] [blame]
diff --git a/build.xml b/build.xml
index a5ba0f5..cc8a606 100644
--- a/build.xml (revision 1177084)
+++ b/build.xml (working copy)
@@ -170,6 +170,13 @@
<property name="jsvc.build.dir" value="${build.dir}/jsvc.${os.arch}" />
<property name="jsvc.install.dir" value="${dist.dir}/libexec" />
+ <exec executable="sh" outputproperty="os-name">
+ <arg value="-c" />
+ <arg value="uname -s | tr '[:upper:]' '[:lower:]'" />
+ </exec>
+ <condition property="os-arch" value="universal">
+ <equals arg1="darwin" arg2="${os-name}" />
+ </condition>
<condition property="os-arch" value="x86_64">
<and>
<os arch="amd64" />
@@ -183,7 +190,7 @@
<os arch="i686" />
</or>
</condition>
- <property name="jsvc.location" value="http://archive.apache.org/dist/commons/daemon/binaries/1.0.2/linux/commons-daemon-1.0.2-bin-linux-${os-arch}.tar.gz" />
+ <property name="jsvc.location" value="http://archive.apache.org/dist/commons/daemon/binaries/1.0.2/${os-name}/commons-daemon-1.0.2-bin-${os-name}-${os-arch}.tar.gz" />
<property name="jsvc.dest.name" value="jsvc.${os.arch}.tar.gz" />
<!-- task-controller properties set here -->