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>

155 files changed, 953 insertions, 177 deletions

diff --git a/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/adept/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/adept/debian/rules b/debian/lenny/applications/adept/debian/rules
index 0e554102b..35a65487f 100755
--- a/debian/lenny/applications/adept/debian/rules
+++ b/debian/lenny/applications/adept/debian/rules
@@ -24,10 +24,15 @@ LDFLAGS += -L/opt/trinity/lib -lept
 post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
-	! [ -f /usr/share/libtool/ltmain.sh ] || \
-		cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
-		cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
+	cp -f /usr/share/libtool/ltmain.sh admin/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/applications/amarok/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/amarok/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/basket/debian/rules b/debian/lenny/applications/basket/debian/rules
index e28ee7171..8293e91bc 100755
--- a/debian/lenny/applications/basket/debian/rules
+++ b/debian/lenny/applications/basket/debian/rules
@@ -36,7 +36,12 @@ config.status: post-patches
 	cp -p /usr/share/misc/config.sub admin/config.sub
 	cp -p /usr/share/misc/config.guess admin/config.guess
 	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) -f admin/Makefile.common dist;
 
 	CFLAGS="$(CFLAGS)" kde_confdir=/etc/trinity ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
diff --git a/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/bibletime/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/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/compizconfig-backend-tdeconfig/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/compizconfig-backend-tdeconfig/debian/rules b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules
index eb681a06a..9ec3176fb 100755
--- a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules
+++ b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules
@@ -19,10 +19,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/applications/digikam/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/digikam/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/filelight/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk
index d81e0a12f..32ba4acfb 100644
--- a/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/filelight/debian/cdbs/debian-qt-kde.mk
@@ -12,7 +12,12 @@ common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
 ifndef _cdbs_class_cmake
 	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;
 endif
 	touch debian/stamp-cvs-make
diff --git a/debian/lenny/applications/gtk3-tqt-engine/debian/rules b/debian/lenny/applications/gtk3-tqt-engine/debian/rules
index e4abe53af..ce37d4ada 100755
--- a/debian/lenny/applications/gtk3-tqt-engine/debian/rules
+++ b/debian/lenny/applications/gtk3-tqt-engine/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/applications/gwenview-i18n/debian/rules b/debian/lenny/applications/gwenview-i18n/debian/rules
index 045fcc43f..67e4d1a9a 100755
--- a/debian/lenny/applications/gwenview-i18n/debian/rules
+++ b/debian/lenny/applications/gwenview-i18n/debian/rules
@@ -22,10 +22,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf && automake -f && \
diff --git a/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/gwenview/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/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules
index 943f33d55..b26fd358f 100755
--- a/debian/lenny/applications/gwenview/debian/rules
+++ b/debian/lenny/applications/gwenview/debian/rules
@@ -27,10 +27,15 @@ DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib
 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/applications/k3b-i18n/debian/rules b/debian/lenny/applications/k3b-i18n/debian/rules
index 1e6d35926..9c9661607 100755
--- a/debian/lenny/applications/k3b-i18n/debian/rules
+++ b/debian/lenny/applications/k3b-i18n/debian/rules
@@ -36,10 +36,15 @@ configure:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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/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
diff --git a/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/k9copy/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/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules
index 365bf8ac6..50c71aaae 100755
--- a/debian/lenny/applications/k9copy/debian/rules
+++ b/debian/lenny/applications/k9copy/debian/rules
@@ -21,10 +21,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/applications/kaffeine-mozilla/debian/rules b/debian/lenny/applications/kaffeine-mozilla/debian/rules
index 456dfaaa9..51d9c565f 100755
--- a/debian/lenny/applications/kaffeine-mozilla/debian/rules
+++ b/debian/lenny/applications/kaffeine-mozilla/debian/rules
@@ -38,10 +38,15 @@ endif
 config.status:
 	dh_testdir
 
-	! [ -f /usr/share/libtool/ltmain.sh ] || \
+ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
 	cp -f /usr/share/libtool/ltmain.sh 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 ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+	cp -f /usr/share/libtool/build-aux/ltmain.sh ltmain.sh
+endif
 
 	aclocal	
 	autoconf
diff --git a/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kaffeine/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/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules
index 3afb59271..48c206c12 100755
--- a/debian/lenny/applications/kaffeine/debian/rules
+++ b/debian/lenny/applications/kaffeine/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
diff --git a/debian/lenny/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kasablanca/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/kasablanca/debian/rules b/debian/lenny/applications/kasablanca/debian/rules
index e12e8b448..db4c7b6c0 100755
--- a/debian/lenny/applications/kasablanca/debian/rules
+++ b/debian/lenny/applications/kasablanca/debian/rules
@@ -18,10 +18,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/katapult/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/katapult/debian/rules b/debian/lenny/applications/katapult/debian/rules
index 8f2dd7642..4dba18a5c 100755
--- a/debian/lenny/applications/katapult/debian/rules
+++ b/debian/lenny/applications/katapult/debian/rules
@@ -28,10 +28,15 @@ DEB_INSTALL_MANPAGES_katapult-trinity = katapult.1
 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 ] || \
-		cp -f /usr/share/libtool/config/ltmain.sh admin/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/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kbarcode/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/kbarcode/debian/rules b/debian/lenny/applications/kbarcode/debian/rules
index 498e95eab..bf11f2499 100755
--- a/debian/lenny/applications/kbarcode/debian/rules
+++ b/debian/lenny/applications/kbarcode/debian/rules
@@ -22,10 +22,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/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kbibtex/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/kbibtex/debian/rules b/debian/lenny/applications/kbibtex/debian/rules
index 590ff494e..24b9a8fff 100755
--- a/debian/lenny/applications/kbibtex/debian/rules
+++ b/debian/lenny/applications/kbibtex/debian/rules
@@ -18,10 +18,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/kbiff/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kbiff/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/kbiff/debian/rules b/debian/lenny/applications/kbiff/debian/rules
index 39a274279..3ab00e0ff 100755
--- a/debian/lenny/applications/kbiff/debian/rules
+++ b/debian/lenny/applications/kbiff/debian/rules
@@ -23,10 +23,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kbookreader/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/kbookreader/debian/rules b/debian/lenny/applications/kbookreader/debian/rules
index ef1dd49ff..62c467af8 100755
--- a/debian/lenny/applications/kbookreader/debian/rules
+++ b/debian/lenny/applications/kbookreader/debian/rules
@@ -19,10 +19,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/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules
index 75422d3a2..4766ace5a 100755
--- a/debian/lenny/applications/kchmviewer/debian/rules
+++ b/debian/lenny/applications/kchmviewer/debian/rules
@@ -43,10 +43,15 @@ build: debian/build-kde
 
 debian/build-kde:
 	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
 	cp -p /usr/share/misc/config.sub admin/config.sub
 	cp -p /usr/share/misc/config.guess admin/config.guess
diff --git a/debian/lenny/applications/kcmautostart/debian/rules b/debian/lenny/applications/kcmautostart/debian/rules
index e4abe53af..ce37d4ada 100755
--- a/debian/lenny/applications/kcmautostart/debian/rules
+++ b/debian/lenny/applications/kcmautostart/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/applications/kcmldap/debian/rules b/debian/lenny/applications/kcmldap/debian/rules
index e4abe53af..ce37d4ada 100755
--- a/debian/lenny/applications/kcmldap/debian/rules
+++ b/debian/lenny/applications/kcmldap/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/applications/kcmldapcontroller/debian/rules b/debian/lenny/applications/kcmldapcontroller/debian/rules
index e4abe53af..ce37d4ada 100755
--- a/debian/lenny/applications/kcmldapcontroller/debian/rules
+++ b/debian/lenny/applications/kcmldapcontroller/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/applications/kcmldapmanager/debian/rules b/debian/lenny/applications/kcmldapmanager/debian/rules
index e4abe53af..ce37d4ada 100755
--- a/debian/lenny/applications/kcmldapmanager/debian/rules
+++ b/debian/lenny/applications/kcmldapmanager/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/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kcpuload/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/kcpuload/debian/rules b/debian/lenny/applications/kcpuload/debian/rules
index 83e0a5113..183ac6b78 100755
--- a/debian/lenny/applications/kcpuload/debian/rules
+++ b/debian/lenny/applications/kcpuload/debian/rules
@@ -49,10 +49,15 @@ configure: configure-stamp
 configure-stamp:
 	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
 	cp -p /usr/share/misc/config.sub admin/config.sub
 	cp -p /usr/share/misc/config.guess admin/config.guess
diff --git a/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdbg/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/kdbg/debian/rules b/debian/lenny/applications/kdbg/debian/rules
index 814462bf3..843f7443b 100755
--- a/debian/lenny/applications/kdbg/debian/rules
+++ b/debian/lenny/applications/kdbg/debian/rules
@@ -20,10 +20,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdbusnotification/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/kdbusnotification/debian/rules b/debian/lenny/applications/kdbusnotification/debian/rules
index 842cf0eb8..9de7eb0d9 100755
--- a/debian/lenny/applications/kdbusnotification/debian/rules
+++ b/debian/lenny/applications/kdbusnotification/debian/rules
@@ -53,10 +53,15 @@ configure: configure-stamp
 configure-stamp:
 	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
 	cp -p /usr/share/misc/config.sub admin/config.sub
 	cp -p /usr/share/misc/config.guess admin/config.guess
diff --git a/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdiff3/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/kdiff3/debian/rules b/debian/lenny/applications/kdiff3/debian/rules
index 0252d28f2..fed277103 100755
--- a/debian/lenny/applications/kdiff3/debian/rules
+++ b/debian/lenny/applications/kdiff3/debian/rules
@@ -21,10 +21,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdirstat/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/kdirstat/debian/rules b/debian/lenny/applications/kdirstat/debian/rules
index afa7b060d..32c38df04 100755
--- a/debian/lenny/applications/kdirstat/debian/rules
+++ b/debian/lenny/applications/kdirstat/debian/rules
@@ -21,10 +21,15 @@ LDFLAGS += -Wl,--as-needed
 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/applications/kdpkg/debian/rules b/debian/lenny/applications/kdpkg/debian/rules
index 2ff6ee66f..9f44a8db3 100755
--- a/debian/lenny/applications/kdpkg/debian/rules
+++ b/debian/lenny/applications/kdpkg/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/applications/keep/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/keep/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/keep/debian/rules b/debian/lenny/applications/keep/debian/rules
index ae055a958..6cf65f019 100755
--- a/debian/lenny/applications/keep/debian/rules
+++ b/debian/lenny/applications/keep/debian/rules
@@ -22,10 +22,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/applications/kerberostray/debian/rules b/debian/lenny/applications/kerberostray/debian/rules
index e4abe53af..ce37d4ada 100755
--- a/debian/lenny/applications/kerberostray/debian/rules
+++ b/debian/lenny/applications/kerberostray/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/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 6b7b16643..61f3ab2dc 100644
--- a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kerry/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/keximdb/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/keximdb/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/keximdb/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/keximdb/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/keximdb/debian/rules b/debian/lenny/applications/keximdb/debian/rules
index 9890ae841..6685b13f2 100755
--- a/debian/lenny/applications/keximdb/debian/rules
+++ b/debian/lenny/applications/keximdb/debian/rules
@@ -36,10 +36,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kftpgrabber/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/kftpgrabber/debian/rules b/debian/lenny/applications/kftpgrabber/debian/rules
index 64be165cd..b9de77262 100755
--- a/debian/lenny/applications/kftpgrabber/debian/rules
+++ b/debian/lenny/applications/kftpgrabber/debian/rules
@@ -19,10 +19,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kile/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/kile/debian/rules b/debian/lenny/applications/kile/debian/rules
index 125236c56..c14e59372 100755
--- a/debian/lenny/applications/kile/debian/rules
+++ b/debian/lenny/applications/kile/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
diff --git a/debian/lenny/applications/kima/debian/rules b/debian/lenny/applications/kima/debian/rules
index 45e052b96..dba0b0120 100755
--- a/debian/lenny/applications/kima/debian/rules
+++ b/debian/lenny/applications/kima/debian/rules
@@ -18,10 +18,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/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kiosktool/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/kiosktool/debian/rules b/debian/lenny/applications/kiosktool/debian/rules
index 7e010577d..f47a41614 100755
--- a/debian/lenny/applications/kiosktool/debian/rules
+++ b/debian/lenny/applications/kiosktool/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/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kkbswitch/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/kkbswitch/debian/rules b/debian/lenny/applications/kkbswitch/debian/rules
index 5059158c3..bfc6f897f 100755
--- a/debian/lenny/applications/kkbswitch/debian/rules
+++ b/debian/lenny/applications/kkbswitch/debian/rules
@@ -17,10 +17,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/klcddimmer/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/klcddimmer/debian/rules b/debian/lenny/applications/klcddimmer/debian/rules
index 55935a695..d1fe9ab90 100755
--- a/debian/lenny/applications/klcddimmer/debian/rules
+++ b/debian/lenny/applications/klcddimmer/debian/rules
@@ -17,9 +17,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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/libtool/config/ltmain.sh admin/ltmain.sh
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 
diff --git a/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kmplayer/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/kmplayer/debian/rules b/debian/lenny/applications/kmplayer/debian/rules
index 093944c34..029a14baa 100755
--- a/debian/lenny/applications/kmplayer/debian/rules
+++ b/debian/lenny/applications/kmplayer/debian/rules
@@ -28,10 +28,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/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules
index 5894cdd46..58260e9ca 100755
--- a/debian/lenny/applications/kmyfirewall/debian/rules
+++ b/debian/lenny/applications/kmyfirewall/debian/rules
@@ -43,10 +43,15 @@ endif
 config.status:
 	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/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kmymoney/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/kmymoney/debian/rules b/debian/lenny/applications/kmymoney/debian/rules
index 54e8597bd..2058b0dcd 100755
--- a/debian/lenny/applications/kmymoney/debian/rules
+++ b/debian/lenny/applications/kmymoney/debian/rules
@@ -21,10 +21,15 @@ LDFLAGS += -Wl,--as-needed
 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/applications/knemo/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/knemo/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/knemo/debian/rules b/debian/lenny/applications/knemo/debian/rules
index 9e3a13754..b13e8bca0 100755
--- a/debian/lenny/applications/knemo/debian/rules
+++ b/debian/lenny/applications/knemo/debian/rules
@@ -21,10 +21,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/applications/knetload/debian/rules b/debian/lenny/applications/knetload/debian/rules
index d955fbe4a..43c44fbe2 100755
--- a/debian/lenny/applications/knetload/debian/rules
+++ b/debian/lenny/applications/knetload/debian/rules
@@ -63,10 +63,15 @@ configure-stamp:
 		touch patch-stamp ;\
 	fi
 
-	! [ -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/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/knetstats/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/knetstats/debian/rules b/debian/lenny/applications/knetstats/debian/rules
index 7da95d739..9a2802477 100755
--- a/debian/lenny/applications/knetstats/debian/rules
+++ b/debian/lenny/applications/knetstats/debian/rules
@@ -19,10 +19,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/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/knetworkmanager8/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/knetworkmanager8/debian/rules b/debian/lenny/applications/knetworkmanager8/debian/rules
index 9c7e598e1..b77ac9d23 100755
--- a/debian/lenny/applications/knetworkmanager8/debian/rules
+++ b/debian/lenny/applications/knetworkmanager8/debian/rules
@@ -21,10 +21,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 ] || \
-		cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
-		cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
+	cp -f /usr/share/libtool/ltmain.sh admin/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/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules
index 26d343f49..2491f3603 100755
--- a/debian/lenny/applications/knights/debian/rules
+++ b/debian/lenny/applications/knights/debian/rules
@@ -42,10 +42,15 @@ debian/knights.xpm: media/hi32-app-knights.png
 config.status:
 	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
 	cp -p /usr/share/misc/config.sub admin/config.sub
 	cp -p /usr/share/misc/config.guess admin/config.guess
diff --git a/debian/lenny/applications/knmap/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knmap/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/knmap/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/knmap/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/knmap/debian/rules b/debian/lenny/applications/knmap/debian/rules
index 7a20baa99..af15b2476 100755
--- a/debian/lenny/applications/knmap/debian/rules
+++ b/debian/lenny/applications/knmap/debian/rules
@@ -18,10 +18,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/knowit/debian/rules b/debian/lenny/applications/knowit/debian/rules
index 07ea32c92..3354a3ff3 100755
--- a/debian/lenny/applications/knowit/debian/rules
+++ b/debian/lenny/applications/knowit/debian/rules
@@ -28,10 +28,15 @@ endif
 config.status:
 	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
 	cp -p /usr/share/misc/config.sub admin/config.sub
 	cp -p /usr/share/misc/config.guess admin/config.guess
diff --git a/debian/lenny/applications/knutclient/debian/rules b/debian/lenny/applications/knutclient/debian/rules
index 761c5e63c..d9016bd72 100755
--- a/debian/lenny/applications/knutclient/debian/rules
+++ b/debian/lenny/applications/knutclient/debian/rules
@@ -35,10 +35,15 @@ endif
 config.status:
 	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/applications/koffice-i18n/debian/rules b/debian/lenny/applications/koffice-i18n/debian/rules
index 478c97b9d..82e0c4c13 100755
--- a/debian/lenny/applications/koffice-i18n/debian/rules
+++ b/debian/lenny/applications/koffice-i18n/debian/rules
@@ -12,10 +12,15 @@ build-stamp:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 	
 	#Configure languages.
diff --git a/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk
index a803f50d6..bb7bdf7e0 100644
--- a/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/koffice/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/konversation/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk
index d81e0a12f..32ba4acfb 100644
--- a/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk
@@ -12,7 +12,12 @@ common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
 ifndef _cdbs_class_cmake
 	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;
 endif
 	touch debian/stamp-cvs-make
diff --git a/debian/lenny/applications/konversation/debian/rules b/debian/lenny/applications/konversation/debian/rules
index 43fbc6878..1e9d066db 100755
--- a/debian/lenny/applications/konversation/debian/rules
+++ b/debian/lenny/applications/konversation/debian/rules
@@ -33,10 +33,15 @@ post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
 ifndef _cdbs_class_cmake
-	! [ -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/applications/kooldock/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kooldock/debian/cdbs/debian-qt-kde.mk
index d81e0a12f..32ba4acfb 100644
--- a/debian/lenny/applications/kooldock/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kooldock/debian/cdbs/debian-qt-kde.mk
@@ -12,7 +12,12 @@ common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
 ifndef _cdbs_class_cmake
 	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;
 endif
 	touch debian/stamp-cvs-make
diff --git a/debian/lenny/applications/kooldock/debian/rules b/debian/lenny/applications/kooldock/debian/rules
index bf5c42248..80d3fb248 100755
--- a/debian/lenny/applications/kooldock/debian/rules
+++ b/debian/lenny/applications/kooldock/debian/rules
@@ -19,10 +19,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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 && \
diff --git a/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kopete-otr/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/kopete-otr/debian/rules b/debian/lenny/applications/kopete-otr/debian/rules
index 4edf9d96d..e466423d3 100755
--- a/debian/lenny/applications/kopete-otr/debian/rules
+++ b/debian/lenny/applications/kopete-otr/debian/rules
@@ -18,10 +18,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/applications/kpicosim/debian/rules b/debian/lenny/applications/kpicosim/debian/rules
index 41b9123f6..965a51c97 100755
--- a/debian/lenny/applications/kpicosim/debian/rules
+++ b/debian/lenny/applications/kpicosim/debian/rules
@@ -36,10 +36,15 @@ endif
 config.status:
 	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
 	cp -p /usr/share/misc/config.sub admin/config.sub
 	cp -p /usr/share/misc/config.guess admin/config.guess
diff --git a/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kpilot/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/kpilot/debian/rules b/debian/lenny/applications/kpilot/debian/rules
index 4edf9d96d..e466423d3 100755
--- a/debian/lenny/applications/kpilot/debian/rules
+++ b/debian/lenny/applications/kpilot/debian/rules
@@ -18,10 +18,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/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index d81e0a12f..32ba4acfb 100644
--- a/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
@@ -12,7 +12,12 @@ common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
 ifndef _cdbs_class_cmake
 	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;
 endif
 	touch debian/stamp-cvs-make
diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules
index 6a43028a3..44d9f566e 100755
--- a/debian/lenny/applications/kpowersave/debian/rules
+++ b/debian/lenny/applications/kpowersave/debian/rules
@@ -31,10 +31,15 @@ DEB_CMAKE_EXTRA_FLAGS := \
 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/applications/krecipes/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/krecipes/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/krecipes/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/krecipes/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/krecipes/debian/rules b/debian/lenny/applications/krecipes/debian/rules
index 3d278aa58..5a49f651f 100755
--- a/debian/lenny/applications/krecipes/debian/rules
+++ b/debian/lenny/applications/krecipes/debian/rules
@@ -17,10 +17,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/krename/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/krename/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/krename/debian/rules b/debian/lenny/applications/krename/debian/rules
index 7df9beee2..575c7f956 100755
--- a/debian/lenny/applications/krename/debian/rules
+++ b/debian/lenny/applications/krename/debian/rules
@@ -21,10 +21,15 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 ### Libtool and Automake updates
 post-patches:: debian/stamp-autothings-update
 debian/stamp-autothings-update:
-	! [ -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
 	
 	for f in /usr/share/automake-1.10/*; do \
diff --git a/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/krusader/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/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules
index d27f15ff5..6768e8703 100755
--- a/debian/lenny/applications/krusader/debian/rules
+++ b/debian/lenny/applications/krusader/debian/rules
@@ -24,10 +24,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/applications/kscope/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kscope/debian/cdbs/debian-qt-kde.mk
index d81e0a12f..32ba4acfb 100644
--- a/debian/lenny/applications/kscope/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kscope/debian/cdbs/debian-qt-kde.mk
@@ -12,7 +12,12 @@ common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
 ifndef _cdbs_class_cmake
 	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;
 endif
 	touch debian/stamp-cvs-make
diff --git a/debian/lenny/applications/kscope/debian/rules b/debian/lenny/applications/kscope/debian/rules
index 65883a481..399c2ff48 100755
--- a/debian/lenny/applications/kscope/debian/rules
+++ b/debian/lenny/applications/kscope/debian/rules
@@ -19,10 +19,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/ksensors/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/ksensors/debian/rules b/debian/lenny/applications/ksensors/debian/rules
index 8030d443a..35f8c85c4 100755
--- a/debian/lenny/applications/ksensors/debian/rules
+++ b/debian/lenny/applications/ksensors/debian/rules
@@ -18,10 +18,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/kshowmail/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kshowmail/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/kshowmail/debian/rules b/debian/lenny/applications/kshowmail/debian/rules
index 3256ecc63..43b4c08dd 100755
--- a/debian/lenny/applications/kshowmail/debian/rules
+++ b/debian/lenny/applications/kshowmail/debian/rules
@@ -17,10 +17,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/kshutdown/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kshutdown/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/kshutdown/debian/rules b/debian/lenny/applications/kshutdown/debian/rules
index 78ead2287..a9c195576 100755
--- a/debian/lenny/applications/kshutdown/debian/rules
+++ b/debian/lenny/applications/kshutdown/debian/rules
@@ -18,10 +18,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/ksplash-engine-moodin/debian/rules b/debian/lenny/applications/ksplash-engine-moodin/debian/rules
index 4542a777a..9ced52925 100755
--- a/debian/lenny/applications/ksplash-engine-moodin/debian/rules
+++ b/debian/lenny/applications/ksplash-engine-moodin/debian/rules
@@ -39,10 +39,15 @@ debian/debiandirs: admin/debianrules
 config.status:
 	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/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules
index 9c031c9b6..328283c93 100755
--- a/debian/lenny/applications/ksquirrel/debian/rules
+++ b/debian/lenny/applications/ksquirrel/debian/rules
@@ -32,10 +32,15 @@ configure:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/ksystemlog/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/ksystemlog/debian/rules b/debian/lenny/applications/ksystemlog/debian/rules
index f28f54627..eed4d5403 100755
--- a/debian/lenny/applications/ksystemlog/debian/rules
+++ b/debian/lenny/applications/ksystemlog/debian/rules
@@ -21,10 +21,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/applications/ktechlab/debian/rules b/debian/lenny/applications/ktechlab/debian/rules
index f42172741..103f921f7 100755
--- a/debian/lenny/applications/ktechlab/debian/rules
+++ b/debian/lenny/applications/ktechlab/debian/rules
@@ -32,10 +32,15 @@ debian/ktechlab.xpm: icons/hi32-app-ktechlab.png
 config.status:
 	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/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index a803f50d6..bb7bdf7e0 100644
--- a/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/ktorrent/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/kuickshow/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kuickshow/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/kuickshow/debian/rules b/debian/lenny/applications/kuickshow/debian/rules
index 1f3a7d8fc..fd30c67bc 100755
--- a/debian/lenny/applications/kuickshow/debian/rules
+++ b/debian/lenny/applications/kuickshow/debian/rules
@@ -20,10 +20,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/applications/kvirc/debian/rules b/debian/lenny/applications/kvirc/debian/rules
index 729103a30..4dabc06e4 100755
--- a/debian/lenny/applications/kvirc/debian/rules
+++ b/debian/lenny/applications/kvirc/debian/rules
@@ -75,10 +75,15 @@ common-install-indep::
 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
 	
 	./autogen.sh
diff --git a/debian/lenny/applications/kvkbd/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kvkbd/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/kvkbd/debian/rules b/debian/lenny/applications/kvkbd/debian/rules
index 1ac5329b7..5ccd79f57 100755
--- a/debian/lenny/applications/kvkbd/debian/rules
+++ b/debian/lenny/applications/kvkbd/debian/rules
@@ -22,10 +22,15 @@ makebuilddir/kvkbd-trinity::
 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/applications/kvpnc/debian/rules b/debian/lenny/applications/kvpnc/debian/rules
index f93ccb291..e7c4f11f0 100755
--- a/debian/lenny/applications/kvpnc/debian/rules
+++ b/debian/lenny/applications/kvpnc/debian/rules
@@ -22,7 +22,12 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 
 makebuilddir/kvpnc-trinity::
 	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/mplayerthumbs/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/mplayerthumbs/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/mplayerthumbs/debian/rules b/debian/lenny/applications/mplayerthumbs/debian/rules
index 89ce8a2dd..b76dff481 100755
--- a/debian/lenny/applications/mplayerthumbs/debian/rules
+++ b/debian/lenny/applications/mplayerthumbs/debian/rules
@@ -17,10 +17,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/piklab/debian/rules b/debian/lenny/applications/piklab/debian/rules
index 682577276..e2cb1fae2 100755
--- a/debian/lenny/applications/piklab/debian/rules
+++ b/debian/lenny/applications/piklab/debian/rules
@@ -35,10 +35,15 @@ config: post-patches config-stamp
 config-stamp:
 	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/applications/potracegui/debian/rules b/debian/lenny/applications/potracegui/debian/rules
index 2f8675d9f..7b2aef671 100755
--- a/debian/lenny/applications/potracegui/debian/rules
+++ b/debian/lenny/applications/potracegui/debian/rules
@@ -35,10 +35,15 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 config.status:
-	! [ -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/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/smb4k/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/smb4k/debian/rules b/debian/lenny/applications/smb4k/debian/rules
index 70b1248dc..9c064a1c9 100755
--- a/debian/lenny/applications/smb4k/debian/rules
+++ b/debian/lenny/applications/smb4k/debian/rules
@@ -22,10 +22,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/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/soundkonverter/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/soundkonverter/debian/rules b/debian/lenny/applications/soundkonverter/debian/rules
index 55e976faf..c4f15cc25 100755
--- a/debian/lenny/applications/soundkonverter/debian/rules
+++ b/debian/lenny/applications/soundkonverter/debian/rules
@@ -26,10 +26,15 @@ install/soundkonverter-amarok-trinity::
 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/applications/tde-style-lipstik/debian/rules b/debian/lenny/applications/tde-style-lipstik/debian/rules
index eb9de9610..004310729 100755
--- a/debian/lenny/applications/tde-style-lipstik/debian/rules
+++ b/debian/lenny/applications/tde-style-lipstik/debian/rules
@@ -73,10 +73,15 @@ endif
 	dh_clean 
 
 patch:
-	! [ -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/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tde-systemsettings/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/tde-systemsettings/debian/rules b/debian/lenny/applications/tde-systemsettings/debian/rules
index 7e11dd034..dc9db1c99 100755
--- a/debian/lenny/applications/tde-systemsettings/debian/rules
+++ b/debian/lenny/applications/tde-systemsettings/debian/rules
@@ -21,10 +21,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/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdeio-apt/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/tdeio-apt/debian/rules b/debian/lenny/applications/tdeio-apt/debian/rules
index cc91a84e3..740a2c8ef 100755
--- a/debian/lenny/applications/tdeio-apt/debian/rules
+++ b/debian/lenny/applications/tdeio-apt/debian/rules
@@ -19,10 +19,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/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdeio-ftps/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/tdeio-ftps/debian/rules b/debian/lenny/applications/tdeio-ftps/debian/rules
index 55935a695..14f8d0476 100755
--- a/debian/lenny/applications/tdeio-ftps/debian/rules
+++ b/debian/lenny/applications/tdeio-ftps/debian/rules
@@ -17,10 +17,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
index d81e0a12f..32ba4acfb 100644
--- a/debian/lenny/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
@@ -12,7 +12,12 @@ common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
 ifndef _cdbs_class_cmake
 	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;
 endif
 	touch debian/stamp-cvs-make
diff --git a/debian/lenny/applications/tdeio-sword/debian/rules b/debian/lenny/applications/tdeio-sword/debian/rules
index c2ff1658d..9314718f4 100755
--- a/debian/lenny/applications/tdeio-sword/debian/rules
+++ b/debian/lenny/applications/tdeio-sword/debian/rules
@@ -18,10 +18,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdeio-umountwrapper/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/tdeio-umountwrapper/debian/rules b/debian/lenny/applications/tdeio-umountwrapper/debian/rules
index 27e351eba..363059df0 100755
--- a/debian/lenny/applications/tdeio-umountwrapper/debian/rules
+++ b/debian/lenny/applications/tdeio-umountwrapper/debian/rules
@@ -19,10 +19,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/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index 33a932634..ede9d744d 100644
--- a/debian/lenny/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
@@ -12,7 +12,12 @@ common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
 ifndef _cdbs_class_cmake
 	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;
 endif
 	touch debian/stamp-cvs-make
diff --git a/debian/lenny/applications/tdepowersave/debian/rules b/debian/lenny/applications/tdepowersave/debian/rules
index a891b0150..c782155c8 100755
--- a/debian/lenny/applications/tdepowersave/debian/rules
+++ b/debian/lenny/applications/tdepowersave/debian/rules
@@ -32,10 +32,15 @@ post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
 ifndef _cdbs_class_cmake
-	! [ -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/applications/tderadio/debian/rules b/debian/lenny/applications/tderadio/debian/rules
index 424c44789..0dca2b923 100755
--- a/debian/lenny/applications/tderadio/debian/rules
+++ b/debian/lenny/applications/tderadio/debian/rules
@@ -34,7 +34,12 @@ debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png
 	convert $< $@
 
 configure:
+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
 	cat /usr/share/aclocal/libtool.m4 > admin/libtool.m4.in
 	cp -f /usr/share/misc/config.sub admin/config.sub
 	cp -f /usr/share/misc/config.guess admin/config.guess
diff --git a/debian/lenny/applications/tdesudo/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdesudo/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/tdesudo/debian/rules b/debian/lenny/applications/tdesudo/debian/rules
index 83c31e0c9..692fd3e93 100755
--- a/debian/lenny/applications/tdesudo/debian/rules
+++ b/debian/lenny/applications/tdesudo/debian/rules
@@ -28,10 +28,15 @@ clean::
 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/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdmtheme/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/tdmtheme/debian/rules b/debian/lenny/applications/tdmtheme/debian/rules
index cc4a5d1a8..ea483bed0 100755
--- a/debian/lenny/applications/tdmtheme/debian/rules
+++ b/debian/lenny/applications/tdmtheme/debian/rules
@@ -21,10 +21,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/applications/tellico/debian/rules b/debian/lenny/applications/tellico/debian/rules
index 118fb52ac..0715a74bb 100755
--- a/debian/lenny/applications/tellico/debian/rules
+++ b/debian/lenny/applications/tellico/debian/rules
@@ -38,10 +38,15 @@ config.status:
 	# this makes the file more recent than configure and avoid make calling
 	# autoheader
 
-	! [ -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
 	cp -p /usr/share/misc/config.sub admin/config.sub
 	cp -p /usr/share/misc/config.guess admin/config.guess
diff --git a/debian/lenny/applications/tork/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tork/debian/cdbs/debian-qt-kde.mk
index f72df2152..b4b889c6d 100644
--- a/debian/lenny/applications/tork/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tork/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/tork/debian/rules b/debian/lenny/applications/tork/debian/rules
index 38a29895e..36fed7dc5 100755
--- a/debian/lenny/applications/tork/debian/rules
+++ b/debian/lenny/applications/tork/debian/rules
@@ -17,10 +17,15 @@ debian/stamp-bootstrap:
 	dh_testdir
 
 	# Regenerate build system
-	! [ -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
 
 	autoreconf --install && automake -f && \
diff --git a/debian/lenny/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/twin-style-crystal/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/twin-style-crystal/debian/rules b/debian/lenny/applications/twin-style-crystal/debian/rules
index 00b9013fa..fc83f08af 100755
--- a/debian/lenny/applications/twin-style-crystal/debian/rules
+++ b/debian/lenny/applications/twin-style-crystal/debian/rules
@@ -19,10 +19,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/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index c807eed8c..9920696ce 100644
--- a/debian/lenny/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/yakuake/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/yakuake/debian/rules b/debian/lenny/applications/yakuake/debian/rules
index aa22c8b59..714a3bb7f 100755
--- a/debian/lenny/applications/yakuake/debian/rules
+++ b/debian/lenny/applications/yakuake/debian/rules
@@ -21,10 +21,15 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 ### Libtool and Automake updates
 post-patches:: debian/stamp-autothings-update
 debian/stamp-autothings-update:
-	! [ -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