From 09b52dab01a59f21ce1966ef526a1f7d596b5427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 13 Feb 2016 16:41:43 +0100 Subject: Fix FTBFS on Debian and Ubuntu due to move libtool ltmain.sh from /usr/share/libtool/config into /usr/share/libtool/build-aux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../lenny/applications/konversation/debian/cdbs/debian-qt-kde.mk | 5 +++++ debian/lenny/applications/konversation/debian/rules | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'debian/lenny/applications/konversation') 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 -- cgit v1.2.1