From 83ae03d05933f57495d41cf2cf376f688f28967a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 22 Feb 2014 16:48:16 -0500
Subject: libre/apache-ant: fix a few (non-critical) symlinks

---
 libre/apache-ant/PKGBUILD | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libre/apache-ant/PKGBUILD')

diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
index 1883b7682..a635c6e90 100644
--- a/libre/apache-ant/PKGBUILD
+++ b/libre/apache-ant/PKGBUILD
@@ -12,7 +12,7 @@ provides=("apache-ant-libre=$pkgver")
 replaces=("apache-ant-libre")
 conflicts=("apache-ant-libre")
 
-pkgrel=2.1 # newer than Arch's 1.9.3-2
+pkgrel=2.2 # newer than Arch's 1.9.3-2
 arch=('any')
 depends=('java-environment')
 makedepends=('jh')
@@ -116,7 +116,9 @@ package() {
     base=$(jh mvn-basename org.apache.ant $a $pkgver)
     install -d "${pkgdir}/${base%/*}"
     ln -sfvr "${pkgdir}/${ANT_HOME}/lib/$a.pom" "${pkgdir}/${base}.pom"
-    ln -sfvr "${pkgdir}/${ANT_HOME}/lib/$a.jar" "${pkgdir}/${base}.jar"
+    if [[ -e "${pkgdir}/${ANT_HOME}/lib/$a.jar" ]]; then
+	    ln -sfvr "${pkgdir}/${ANT_HOME}/lib/$a.jar" "${pkgdir}/${base}.jar"
+    fi
   done
 
   cd "${pkgdir}"/${ANT_HOME}/bin
@@ -128,7 +130,7 @@ package() {
   install -d "${pkgdir}"/usr/share/{doc,licenses}/${pkgname}
   ln -sfvr "${pkgdir}/${ANT_HOME}/README"   "${pkgdir}/usr/share/doc/${pkgname}/README"
   ln -sfvr "${pkgdir}/${ANT_HOME}/WHATSNEW" "${pkgdir}/usr/share/doc/${pkgname}/WHATSNEW"
-  ln -sfvr "${pkgdir}/${ANT_HOME}/docs"     "${pkgdir}/usr/share/doc/${pkgname}/html"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/manual"   "${pkgdir}/usr/share/doc/${pkgname}/html"
   ln -sfvr "${pkgdir}/${ANT_HOME}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   ln -sfvr "${pkgdir}/${ANT_HOME}/NOTICE"   "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
 }
-- 
cgit v1.2.3