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>

7 files changed, 39 insertions, 4 deletions

diff --git a/debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/libraries/kipi-plugins/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/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/libraries/libkdcraw/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/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/libraries/libkexiv2/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/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/libraries/libkipi/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/libraries/libksquirrel/debian/rules b/debian/lenny/libraries/libksquirrel/debian/rules
index ff118fd10..15f00b785 100755
--- a/debian/lenny/libraries/libksquirrel/debian/rules
+++ b/debian/lenny/libraries/libksquirrel/debian/rules
@@ -31,10 +31,15 @@ config.status: configure
 configure:
 	dh_testdir
 
-	! [ -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
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub admin/config.sub
diff --git a/debian/lenny/libraries/libtdeldap/debian/rules b/debian/lenny/libraries/libtdeldap/debian/rules
index e4abe53af..ce37d4ada 100755
--- a/debian/lenny/libraries/libtdeldap/debian/rules
+++ b/debian/lenny/libraries/libtdeldap/debian/rules
@@ -17,10 +17,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
diff --git a/debian/lenny/libraries/libtqt-perl/debian/rules b/debian/lenny/libraries/libtqt-perl/debian/rules
index 0af0c47f4..28a9c7817 100755
--- a/debian/lenny/libraries/libtqt-perl/debian/rules
+++ b/debian/lenny/libraries/libtqt-perl/debian/rules
@@ -39,7 +39,12 @@ pre-build:: pre-build-stamp
 pre-build-stamp:
 	for f in $(SAVERESTORE) ; do [ -e $$f.d-r-orig ] || cp -rp $$f $$f.d-r-orig ; done
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+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/misc/config.guess admin/config.guess
 	cp -f /usr/share/misc/config.sub admin/config.sub
 	make -f admin/Makefile.common