Fixed symlinking to proper /opt/ directory

2 files changed, 10 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..25de88bc6051
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+src
+pkg
+*.pkg.tar
+*.tar.xz
+*.tar.gz
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 8b26cb9b3600..36d659fd83c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,16 +8,17 @@ arch=('x86_64')
 license=('GPL')
 depends=()
 conflict=('')
+instdir="/opt/${pkgname}"
 provides=("casa")
 source=("https://casa.nrao.edu/download/distro/casa/release/el7/casa-release-${pkgver}-${pkgrel}.el7.tar.gz")
 md5sums=('89292f54d777ccde2f9b9b22b445a1e1')
 package() {
   # Copy out files
-  install -m755 -d "${pkgdir}/opt/${pkgname}"
-  rsync -a --no-o --no-g "${srcdir}/casa-release-${pkgver}-${pkgrel}.el7/" "${pkgdir}/opt/${pkgname}"
+  install -m755 -d "${pkgdir}/${instdir}"
+  rsync -a --no-o --no-g "${srcdir}/casa-release-${pkgver}-${pkgrel}.el7/" "${pkgdir}/${instdir}"
   # Symlink executables
   install -m755 -d "${pkgdir}/usr/bin/"
   for _executable in casa casa-config mpicasa; do
-    ln -s "${pkgdir}/opt/${pkgname}/bin/${_executable}" "${pkgdir}/usr/bin/${_executable}"
+    ln -s "${instdir}/bin/${_executable}" "${pkgdir}/usr/bin/${_executable}"
   done 
 }