fix PKGBUILD

2 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aae4ff205fff..d4ff8cecfa52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = noweb
 	pkgdesc = A Simple, Extensible Tool for Literate Programming build against ICON libs and texlive
 	pkgver = 2_12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/nrnrnr/noweb
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 767fe7593ec6..f3db10263e51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Contributor: Mathieu.clabaut <mathieu.clabaut@gmail.com>
-# Contributor: Stefan Husmann  <stefan-husmann@t-online.de>
+# Maintainer: Stefan Husmann  <stefan-husmann@t-online.de>
 # Contributor: Dr. Hammer <dr_hammer@safe-mail.net>
 
 pkgname=noweb
 pkgver=2_12
-pkgrel=1
+pkgrel=2
 pkgdesc="A Simple, Extensible Tool for Literate Programming build \
 against ICON libs and texlive"
 url="https://github.com/nrnrnr/noweb"
@@ -19,23 +19,26 @@ options=('!strip')
 prepare() {
   cd $pkgname-$pkgver
   sed -i -e 's+BIN=/usr/local/noweb+BIN=\$\(MyDestdir\)/usr/bin+' \
-    -e 's+LIB=/usr/local/noweb/lib+LIB=\$\(MyDestdir\)/usr/lib/noweb+' \
-    -e 's+MAN=/usr/local/noweb/man+MAN=\$\(MyDestdir\)/usr/share/man+' \
-    -e 's+/usr/local/tex/inputs+\$\(MyDestdir\)/usr/share/texmf/tex/generic/noweb+' \
-    -e 's+$(HOME)/www/noweb/FAQ.html+'$srcdir/$pkgname-$pkgver'/src/FAQ.html+' \
-    -e 's+mkdir+install -d+' -e 's+> \$\(BIN\)+> \$pkgdir/bin/+' src/Makefile
+      -e 's+LIB=/usr/local/noweb/lib+LIB=\$\(MyDestdir\)/usr/lib/noweb+' \
+      -e 's+LIBSRC=awk+LIBSRC=icon+' \
+      -e 's+ICONC=iconc+ICONC=icont+' \
+      -e 's+MAN=/usr/local/noweb/man+MAN=\$\(MyDestdir\)/usr/share/man+' \
+      -e 's+/usr/local/tex/inputs+\$\(MyDestdir\)/usr/share/texmf/tex/generic/noweb+' \
+      -e 's+$(HOME)/www/noweb/FAQ.html+'$srcdir/$pkgname-$pkgver'/src/FAQ.html+' \
+      -e 's+mkdir+install -d+' -e 's+> \$\(BIN\)+> \$pkgdir/bin/+' \
+      -e 's+ELISP=/dev/null+ELISP=\$\(MyDestdir\)/usr/share/emacs/site-lisp+' src/Makefile
   sed -i -e 's+LIB=/dev/null.*$+LIB=\$\(MyDestdir\)/usr/lib/noweb+' \
     contrib/Makefile
   sed -i -e  's+^WWW=.*$+WWW\$\(MyDestdir\)=/usr/share/noweb/www+' \
-    src/xdoc/Makefile 
-  sed -i -e 's+texhash+/usr/bin/texhash+' src/Makefile
-  sed -i -e 's+ELISP=/dev/null+ELISP=\$\(MyDestdir\)/usr/share/emacs/site-lisp+' \
-      src/Makefile
+      src/xdoc/Makefile
+  sed -i '132,133d' src/icon/pdcached.icn
+  sed -i '138,139d' src/icon/pdcached.icn
 }
 
 build() {
   cd $pkgname-$pkgver/src
-  make MyDestdir="$pkgdir" LIBSRC=icon ICONC="icon -f l" boot
+  make touch boot
+  make all
 }
 
 package() {
@@ -45,8 +48,7 @@ package() {
   install -d "$pkgdir"/usr/share/texmf/tex/generic
   install -d "$pkgdir"/usr/lib/noweb/
   install -d "$pkgdir"/usr/share/emacs/site-lisp
-  ./awkname nawk
-  make MyDestdir="$pkgdir" LIBSRC=icon ICONC=icon install || true 
+  make PREFIX=/usr MyDestdir="$pkgdir" install || true 
   find "$pkgdir" -type f -exec sed -i "s+${pkgdir}+/+g" '{}' ';'
 }