Fix FTBFS on Debian and Ubuntu due to move libtool ltmain.sh

from /usr/share/libtool/config into /usr/share/libtool/build-aux

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

2 files changed, 12 insertions, 2 deletions

diff --git a/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/k3b/debian/cdbs/debian-qt-kde.mk
@@ -11,7 +11,12 @@ _cdbs_class_debian-qt-kde := 1
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
 	touch debian/stamp-cvs-make
 
diff --git a/debian/lenny/applications/k3b/debian/rules b/debian/lenny/applications/k3b/debian/rules
index 2e99e1dde..6a0753f65 100755
--- a/debian/lenny/applications/k3b/debian/rules
+++ b/debian/lenny/applications/k3b/debian/rules
@@ -23,10 +23,15 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
-	! [ -f /usr/share/libtool/ltmain.sh ] || \
+ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+endif
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	
 	make -f admin/Makefile.common cvs