Fix tools and Perl modules

2 files changed, 31 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41eb3ca27a4d..0e8f59f94e92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = meme
 	pkgdesc = The MEME suite provides tools for discovering and using protein and DNA sequence motifs
 	pkgver = 5.0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://meme-suite.org/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 58854053e168..a451d0915e19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 #Contributor: Charles E. Vejnar
 pkgname=meme
 pkgver=5.0.4
-pkgrel=1
+pkgrel=2
 _minor=
 pkgdesc="The MEME suite provides tools for discovering and using protein and DNA sequence motifs"
 arch=("i686" "x86_64")
@@ -26,28 +26,33 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
-    make prefix="${pkgdir}/usr" install
-
-    # Rename Perl modules
-    for fname in $(ls -1 ${pkgdir}/usr/lib/perl/); do
-        if [[ $fname = meme-*.pm ]]; then
-            mv ${pkgdir}/usr/lib/perl/$fname ${pkgdir}/usr/lib/perl/${fname#meme-}
-        fi
-    done
-
-    perl_major=$(perl -e '$^V =~ /^v(\d+)/ and print $1; print "\n"')
-    perl_minor=$(perl -e '$^V =~ /\.(\d+)\./ and print $1; print "\n"')
-    mkdir -p "${pkgdir}/usr/lib/perl${perl_major}/${perl_major}.${perl_minor}"
-    mv "${pkgdir}/usr/lib/meme-${pkgver}${_minor}/perl" "${pkgdir}/usr/lib/perl${perl_major}/${perl_major}.${perl_minor}/vendor_perl"
-
-    sed -i -e "s/\(PROG => \)/\1'meme-'./g" "${pkgdir}/usr/bin/meme-meme-chip"
-
-    # Add symlinks for those files:
-    ln -s "meme-meme_xml_to_html" "${pkgdir}/usr/bin/meme_xml_to_html"
-    ln -s "meme-glam2html" "${pkgdir}/usr/bin/glam2html"
-    ln -s "meme-glam2psfm" "${pkgdir}/usr/bin/glam2psfm"
-    ln -s "meme-mast_xml_to_html" "${pkgdir}/usr/bin/mast_xml_to_html"
-    ln -s "meme-mast_xml_to_txt" "${pkgdir}/usr/bin/mast_xml_to_txt"
+  cd "${srcdir}/${pkgname}-${pkgver%_*}"
+
+  make prefix="${pkgdir}/usr" install
+
+  # Rename Perl modules
+  perl_major=$(perl -e '$^V =~ /^v(\d+)/ and print $1; print "\n"')
+  perl_minor=$(perl -e '$^V =~ /\.(\d+)\./ and print $1; print "\n"')
+
+  mkdir -p "${pkgdir}/usr/lib/perl${perl_major}/${perl_major}.${perl_minor}/vendor_perl"
+  for fname in $(ls -1 "${pkgdir}/usr/lib/meme-${pkgver}${_minor}/perl"); do
+    if [[ $fname = meme-*.pm ]]; then
+      mv "${pkgdir}/usr/lib/meme-${pkgver}${_minor}/perl/${fname}" "${pkgdir}/usr/lib/perl${perl_major}/${perl_major}.${perl_minor}/vendor_perl/${fname#meme-}"
+    fi
+  done
+  rmdir "${pkgdir}/usr/lib/meme-${pkgver}${_minor}/perl"
+
+
+  sed -i -e "s/\(PROG => \)/\1'meme-'./g" "${pkgdir}/usr/bin/meme-meme-chip"
+
+  # Add symlinks for those files:
+  ln -s "meme-meme_xml_to_html" "${pkgdir}/usr/bin/meme_xml_to_html"
+  ln -s "meme-glam2html" "${pkgdir}/usr/bin/glam2html"
+  ln -s "meme-glam2psfm" "${pkgdir}/usr/bin/glam2psfm"
+  ln -s "meme-mast_xml_to_html" "${pkgdir}/usr/bin/mast_xml_to_html"
+  ln -s "meme-mast_xml_to_txt" "${pkgdir}/usr/bin/mast_xml_to_txt"
+
+  for fname in $(ls -1 "${pkgdir}/usr/libexec/${pkgname}-${pkgver%_*}/"); do
+    ln -s "/usr/libexec/${pkgname}-${pkgver%_*}/${fname}" "${pkgdir}/usr/bin/${fname}"
+  done
 }