Fix CFGDIR value (close FS#31346), Add info pages

2 files changed, 21 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 173b9fdacd86..058412f206c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=latex2rtf
 pkgver=2.2.1c
-pkgrel=1
+pkgrel=2
 pkgdesc="LaTeX to RTF converter"
 arch=('i686' 'x86_64')
 url="http://latex2rtf.sourceforge.net/"
@@ -14,12 +14,13 @@ checkdepends=(
   'texlive-core'
   'texlive-latexextra' # for a4wide package
 )
+install=latex2rtf.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('3fd5874de8988cf45f8862d2b3db8ed13a04caa4')
 
 build() {
   cd "${srcdir}/${pkgname}-2.2.1"
-  make
+  make DESTDIR=/usr
 }
 
 check() {
@@ -29,6 +30,6 @@ check() {
 
 package() {
   cd "${srcdir}/${pkgname}-2.2.1"
-  make DESTDIR=${pkgdir}/usr install
-  sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' ${pkgdir}/usr/bin/latex2png
+  make DESTDIR="${pkgdir}/usr" install install-info
+  sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' "${pkgdir}/usr/bin/latex2png"
 }
diff --git a/latex2rtf.install b/latex2rtf.install
new file mode 100644
index 000000000000..8dbcca926e8a
--- /dev/null
+++ b/latex2rtf.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file=latex2rtf.info
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}