# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1523666073 -10800
# Node ID 25deb7c6df08f294e356d00638e9967390dc5e07
# Parent  ada7455aa1719d0a577af58796d2701b19549ecf
More fix libtool

diff -r ada7455aa171 -r 25deb7c6df08 libgnome-keyring/receipt
--- a/libgnome-keyring/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgnome-keyring/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -19,6 +19,7 @@
 		--libexecdir=/usr/lib/$PACKAGE \
 		--sysconfdir=/etc/gnome \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libgnome-keyring3/receipt
--- a/libgnome-keyring3/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgnome-keyring3/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -17,6 +17,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libgnomecanvas/receipt
--- a/libgnomecanvas/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgnomecanvas/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -20,7 +20,9 @@
 		--with-html-dir=/usr/share/doc \
 		--enable-glade \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libgnomeprint/receipt
--- a/libgnomeprint/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgnomeprint/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -6,8 +6,9 @@
 SHORT_DESC="GNOME print library"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.gnome.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.gnome.org/"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev pango-dev intltool flex libart_lgpl-dev libxml2-dev"
@@ -18,7 +19,9 @@
 		--with-html-dir=/usr/share/doc \
 		--without-cups \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libgnomeprintui/receipt
--- a/libgnomeprintui/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgnomeprintui/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -21,7 +21,9 @@
 	./configure \
 		--with-html-dir=/usr/share/doc \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libgnomeui/receipt
--- a/libgnomeui/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgnomeui/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -21,7 +21,9 @@
 	./configure \
 		--libexecdir=/usr/lib/$PACKAGE \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libgpg-error/receipt
--- a/libgpg-error/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgpg-error/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -18,7 +18,10 @@
 SPLIT="libgpg-error-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libgphoto2/receipt
--- a/libgphoto2/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgphoto2/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -14,21 +14,18 @@
 BUILD_DEPENDS="libtool gettext libjpeg-turbo-dev libexif-dev libusb-dev"
 SPLIT="libgphoto2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		udevscriptdir=/lib/udev \
 		--with-exif \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libgphoto2)
 			copy @std
diff -r ada7455aa171 -r 25deb7c6df08 libgpod/receipt
--- a/libgpod/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgpod/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -16,7 +16,10 @@
 SPLIT="libgpod-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libgringotts/receipt
--- a/libgringotts/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgringotts/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libgsf/receipt
--- a/libgsf/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgsf/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -20,7 +20,9 @@
 	./configure \
 		--enable-introspection \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libgtkimageview/receipt
--- a/libgtkimageview/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgtkimageview/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -6,10 +6,9 @@
 SHORT_DESC="Simple image viewer widget for GTK"
 MAINTAINER="gokhlayeh@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://trac.bjourne.webfactional.com/" 
+WEB_SITE="http://trac.bjourne.webfactional.com/"
 
-SOURCE="gtkimageview"
-TARBALL="$SOURCE-$VERSION.tar.gz"
+TARBALL="gtkimageview-$VERSION.tar.gz"
 WGET_URL="http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/$TARBALL?format=raw"
 
 BUILD_DEPENDS="gtk+-dev expat-dev"
@@ -17,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libgtop/receipt
--- a/libgtop/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libgtop/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -16,7 +16,10 @@
 SPLIT="libgtop-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libhangul/receipt
--- a/libhangul/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libhangul/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -17,6 +17,7 @@
 	./configure \
 		--datadir=/usr/lib \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libharu/receipt
--- a/libharu/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libharu/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -14,22 +14,20 @@
 BUILD_DEPENDS="automake libtool zlib-dev libpng16-dev"
 SPLIT="libharu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	touch include/config.h.in
 	aclocal &&
 	libtoolize &&
 	automake --add-missing &&
 	autoconf &&
+
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libharu)
 			copy @std
diff -r ada7455aa171 -r 25deb7c6df08 libhtp/receipt
--- a/libhtp/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libhtp/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,7 +15,10 @@
 SPLIT="libhtp-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libhx/receipt
--- a/libhx/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libhx/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,9 +15,8 @@
 SPLIT="libhx"
 
 compile_rules() {
-	./configure \
-		--prefix=/usr \
-		$CONFIGURE_ARGS &&
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
@@ -25,15 +24,11 @@
 genpkg_rules() {
 	case $PACKAGE in
 		libhx)
-			mkdir -p $fs/usr/lib
-			cp -a $install/usr/lib/libHX.so* $fs/usr/lib
+			copy @std
 			DEPENDS="coreutils-file-special"
 			;;
 		*-dev)
-			mkdir -p $fs/usr/lib
-			cp -a $install/usr/lib/*a $fs/usr/lib
-			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-			cp -a $install/usr/include $fs/usr
+			copy @dev
 			;;
 	esac
 }
diff -r ada7455aa171 -r 25deb7c6df08 libid3tag/receipt
--- a/libid3tag/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libid3tag/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,10 +15,10 @@
 SPLIT="libid3tag-dev"
 
 compile_rules() {
-	./configure \
-		--prefix=/usr \
-		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	# libid3tag.pc
 	mkdir -p $install/usr/lib/pkgconfig/
diff -r ada7455aa171 -r 25deb7c6df08 libidl/receipt
--- a/libidl/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libidl/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -7,7 +7,6 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://github.com/GNOME/libIDL"
-CROSS="bug: can not run test program"
 
 TARBALL="libIDL-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/libIDL/${VERSION%.*}/$TARBALL"
@@ -15,19 +14,18 @@
 BUILD_DEPENDS="bison flex glib-dev"
 SPLIT="libidl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+CROSS="bug: can not run test program"
+
+compile_rules() {
 	./configure \
 		--cache-file=config.cache \
-		--build=$HOST_SYSTEM \
-		--host=$HOST_SYSTEM &&
-	make && make install
+		$CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libidl)
 			copy @std
diff -r ada7455aa171 -r 25deb7c6df08 libidn/receipt
--- a/libidn/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libidn/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -19,7 +19,9 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
-	make $MAKEFLAGS && make install
+	fix libtool &&
+	make $MAKEFLAGS &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libidn2/receipt
--- a/libidn2/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libidn2/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,7 +15,10 @@
 SPLIT="libidn2-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libiec61883/receipt
--- a/libiec61883/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libiec61883/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -14,15 +14,14 @@
 BUILD_DEPENDS="libraw1394-dev"
 SPLIT="libiec61883-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libiec61883)
 			copy @std
diff -r ada7455aa171 -r 25deb7c6df08 libimobiledevice/receipt
--- a/libimobiledevice/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libimobiledevice/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -3,10 +3,12 @@
 PACKAGE="libimobiledevice"
 VERSION="1.1.1"
 CATEGORY="misc"
-SHORT_DESC="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
+SHORT_DESC="Software library that talks the protocols to support iPhone and \
+iPod Touch devices on Linux"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://libimobiledevice.org"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/downloads/$TARBALL"
 
@@ -14,32 +16,23 @@
 libxml2-dev libgcrypt-dev"
 SPLIT="libimobiledevice-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	patch -Np1 -i $stuff/swig-version-check.patch
-	./configure \
-		$CONFIGURE_ARGS &&
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	libimobiledevice)
-		DEPENDS="gnutls glib libplist usbmuxd"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/lib/*.so* $fs/usr/lib
-		cp -a $install/usr/lib/python* $fs/usr/lib
-		;;
-	libimobiledevice-dev)
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/include $fs/usr
-		cp -a $install/usr/lib/*.*a $fs/usr/lib
-		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-		;;
+		libimobiledevice)
+			copy @std
+			DEPENDS="gnutls glib libplist usbmuxd"
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r ada7455aa171 -r 25deb7c6df08 libindicator-gtk3/receipt
--- a/libindicator-gtk3/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libindicator-gtk3/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -27,6 +27,7 @@
 		--disable-static \
 		--disable-tests \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libiodbc/receipt
--- a/libiodbc/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libiodbc/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libirman/receipt
--- a/libirman/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libirman/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libisofs/receipt
--- a/libisofs/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libisofs/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,7 +15,10 @@
 SPLIT="libisofs-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libjpeg-turbo/receipt
--- a/libjpeg-turbo/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libjpeg-turbo/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -19,9 +19,10 @@
 	./configure \
 		--with-jpeg8 \
 		--disable-static \
-		--docdir=/usr/share/doc/$PACKAGE-$VERSION \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libjson-c/receipt
--- a/libjson-c/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libjson-c/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -17,24 +17,16 @@
 compile_rules() {
 	sed -i 's/-Werror /&-Wno-error=unused-but-set-variable /' Makefile*
 	./autogen.sh
-	./configure \
-		--prefix=/usr \
-		$CONFIGURE_ARGS &&
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
-	make -j 1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$DESTDIR install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
-		libjson-c)
-			mkdir -p $fs/usr/lib
-			cp -a $install/usr/lib/*.so* $fs/usr/lib
-			;;
-		*-dev)
-			mkdir -p $fs/usr/lib
-			cp -a $install/usr/include $fs/usr/
-			cp -a $install/usr/lib/*a $fs/usr/lib
-			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-			;;
+		libjson-c) copy @std;;
+		*-dev)     copy @dev;;
 	esac
 }
diff -r ada7455aa171 -r 25deb7c6df08 libkeybinder/receipt
--- a/libkeybinder/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libkeybinder/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -16,16 +16,15 @@
 pygtk-dev pygobject-dev automake autoconf libtool"
 SPLIT="libkeybinder-python libkeybinder-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	autoreconf -vif &&
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libkeybinder)
 			copy libkeybinder.so*
diff -r ada7455aa171 -r 25deb7c6df08 libksba/receipt
--- a/libksba/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libksba/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,15 +15,14 @@
 BUILD_DEPENDS="libgpg-error-dev"
 SPLIT="libksba-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libksba) copy @std; DEPENDS="libgpg-error";;
 		*-dev)   copy @dev; DEPENDS="libksba libgpg-error-dev";;
diff -r ada7455aa171 -r 25deb7c6df08 liblinebreak/receipt
--- a/liblinebreak/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/liblinebreak/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -14,17 +14,16 @@
 BUILD_DEPENDS="gfortran"
 SPLIT="liblinebreak-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		liblinebreak) copy @std;;
-		*-dev) copy @dev;;
+		*-dev)        copy @dev;;
 	esac
 }
diff -r ada7455aa171 -r 25deb7c6df08 liblo/receipt
--- a/liblo/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/liblo/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,7 +15,10 @@
 SPLIT="liblo-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install || return 1
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	cook_pick_manpages doc/man/man3/[lp]*
 }
diff -r ada7455aa171 -r 25deb7c6df08 liblognorm/receipt
--- a/liblognorm/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/liblognorm/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -16,7 +16,11 @@
 
 compile_rules() {
 	patch -p 1 < $stuff/liblognorm-build-fix.patch
-	./configure $CONFIGURE_ARGS && make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 liblouis/receipt
--- a/liblouis/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/liblouis/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -3,9 +3,9 @@
 PACKAGE="liblouis"
 VERSION="2.5.2-3"
 CATEGORY="utilities"
-LICENSE="GPL3"
 SHORT_DESC="Open-source braille translator and back-translator"
 MAINTAINER="yuripourre@gmail.com"
+LICENSE="GPL3"
 WEB_SITE="https://code.google.com/p/liblouis/"
 
 TARBALL="$PACKAGE-${VERSION:0:5}.tar.gz"
@@ -16,9 +16,9 @@
 
 compile_rules() {
 	./configure \
-		--prefix=/usr \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r ada7455aa171 -r 25deb7c6df08 liblrdf/receipt
--- a/liblrdf/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/liblrdf/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -3,9 +3,9 @@
 PACKAGE="liblrdf"
 VERSION="0.4.0"
 CATEGORY="multimedia"
+SHORT_DESC="A library for the manipulation of RDF file in LADSPA plugins"
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
-SHORT_DESC="A library for the manipulation of RDF file in LADSPA plugins"
 WEB_SITE="http://sourceforge.net/projects/lrdf"
 
 TARBALL="${PACKAGE}-${VERSION}.tar.gz"
@@ -20,7 +20,11 @@
 	patch -Np0 -i $stuff/raptor2.diff
 	patch -Np1 -i $stuff/pkgconfig-raptor.patch
 	autoreconf -vfi
-	./configure $CONFIGURE_ARGS && make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libmad/receipt
--- a/libmad/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmad/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -19,16 +19,15 @@
 	touch NEWS AUTHORS ChangeLog
 	autoreconf -fi || return 1
 
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
-		libmad)
-			copy @std
-			;;
-		*-dev)
-			copy @dev
-			;;
+		libmad) copy @std;;
+		*-dev)  copy @dev;;
 	esac
 }
diff -r ada7455aa171 -r 25deb7c6df08 libmcrypt/receipt
--- a/libmcrypt/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmcrypt/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libmicrohttpd/receipt
--- a/libmicrohttpd/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmicrohttpd/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -17,16 +17,15 @@
 
 compile_rules() {
 	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
 		--disable-dependency-tracking \
 		--enable-largefile \
 		--enable-curl \
 		--enable-messages \
 		--with-pic \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install || return 1
+	fix libtool &&
+	make &&
+	make DESTDIR=$DESTDIR install || return 1
 
 	mkdir -p $DESTDIR/usr/include/$PACKAGE
 	cp -a src/include/platform.h $DESTDIR/usr/include/$PACKAGE
diff -r ada7455aa171 -r 25deb7c6df08 libmikmod/receipt
--- a/libmikmod/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmikmod/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -19,6 +19,7 @@
 	sed -i 's|\$(SHELL)|/bin/bash|' configure
 
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r ada7455aa171 -r 25deb7c6df08 libmms/receipt
--- a/libmms/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmms/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -14,15 +14,14 @@
 BUILD_DEPENDS="glib-dev"
 SPLIT="libmms-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libmms)
 			copy @std
diff -r ada7455aa171 -r 25deb7c6df08 libmng/receipt
--- a/libmng/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmng/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -14,22 +14,18 @@
 BUILD_DEPENDS="zlib-dev libjpeg-turbo-dev lcms2-dev"
 SPLIT="libmng-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
-	make && make install &&
+	fix libtool &&
+	make &&
+	make install || return 1
 
-	docdir=$install/usr/share/doc/libmng-$VERSION &&
-	install -v -m755 -d             $docdir &&
-	install -v -m644 doc/libmng.txt $docdir
+	cook_pick_docs doc/libmng.txt
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libmng) copy @std; DEPENDS="lcms2 libjpeg-turbo zlib";;
 		*-dev)  copy @dev; DEPENDS="libmng lcms2-dev libjpeg-turbo-dev zlib-dev";;
diff -r ada7455aa171 -r 25deb7c6df08 libmnl/receipt
--- a/libmnl/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmnl/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -14,12 +14,15 @@
 SPLIT="libmnl-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		libmnl) copy @std;;
-		*-dev) copy @dev;;
+		*-dev)  copy @dev;;
 	esac
 }
diff -r ada7455aa171 -r 25deb7c6df08 libmodplug/receipt
--- a/libmodplug/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmodplug/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -14,7 +14,10 @@
 SPLIT="libmodplug-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libmpd/receipt
--- a/libmpd/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmpd/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,7 +15,10 @@
 SPLIT="libmpd-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ada7455aa171 -r 25deb7c6df08 libmpdclient/receipt
--- a/libmpdclient/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmpdclient/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,16 +15,15 @@
 SPLIT="libmpdclient-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
-		libmpdclient)
-			copy @std
-			;;
-		*-dev)
-			copy @dev
-			;;
+		libmpdclient) copy @std;;
+		*-dev)        copy @dev;;
 	esac
 }
diff -r ada7455aa171 -r 25deb7c6df08 libmpeg2/receipt
--- a/libmpeg2/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmpeg2/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -7,6 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://libmpeg2.sourceforge.net/"
+LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libmpeg2.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://libmpeg2.sourceforge.net/files/$TARBALL" # no $SF_MIRROR
@@ -15,27 +16,21 @@
 xorg-libSM-dev xorg-libXv-dev"
 SPLIT="libmpeg2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libmpeg2.html
+compile_rules() {
 	sed -i 's/static const/static/' libmpeg2/idct_mmx.c &&
 
 	./configure \
 		--enable-shared \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
-	make install &&
+	make install || return 1
 
-	docdir=$install/usr/share/doc/mpeg2dec-$VERSION &&
-	mkdir -p $docdir &&
-	install -v -m644 README doc/libmpeg2.txt $docdir
+	cook_pick_docs README doc/libmpeg2.txt
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libmpeg2)
 			copy @std
diff -r ada7455aa171 -r 25deb7c6df08 libmrss/receipt
--- a/libmrss/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmrss/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -15,15 +15,14 @@
 BUILD_DEPENDS="libnxml-dev curl-dev"
 SPLIT="libmrss-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libmrss)
 			copy @std
diff -r ada7455aa171 -r 25deb7c6df08 libmtp/receipt
--- a/libmtp/receipt	Sat Apr 14 02:49:57 2018 +0300
+++ b/libmtp/receipt	Sat Apr 14 03:34:33 2018 +0300
@@ -14,24 +14,22 @@
 BUILD_DEPENDS="libusb-dev libgcrypt-dev"
 SPLIT="mtp-tools libmtp-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--with-udev=/etc/udev \
 		$CONFIGURE_ARGS &&
-	make && make install &&
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	# udev rules in /etc/udev/rules.d/; udev execs in /lib/udev/
-	mkdir -p $install/lib/udev &&
-	mv $install/etc/udev/mtp-probe $install/lib/udev &&
+	mkdir -p $install/lib/udev
+	mv $install/etc/udev/mtp-probe $install/lib/udev
 	sed -i 's#/etc/udev/mtp-probe#/lib/udev/mtp-probe#' \
 		$install/etc/udev/rules.d/69-libmtp.rules
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libmtp)
 			copy udev/ *.so*