From 76f308b87dd26fe2fda32bcfc42a32945f8f11e7 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 (cherry picked from commit 09b52dab01a59f21ce1966ef526a1f7d596b5427) --- debian/lenny/dependencies/akode/debian/cdbs/debian-qt-kde.mk | 5 +++++ debian/squeeze/dependencies/akode/debian/cdbs/debian-qt-kde.mk | 5 +++++ ubuntu/maverick/dependencies/akode/debian/cdbs/debian-qt-kde.mk | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/debian/lenny/dependencies/akode/debian/cdbs/debian-qt-kde.mk b/debian/lenny/dependencies/akode/debian/cdbs/debian-qt-kde.mk index 77998f744..106cba47d 100644 --- a/debian/lenny/dependencies/akode/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/dependencies/akode/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,12 @@ debian/stamp-cvs-make: ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \ 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; \ fi endif diff --git a/debian/squeeze/dependencies/akode/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/dependencies/akode/debian/cdbs/debian-qt-kde.mk index 77998f744..106cba47d 100644 --- a/debian/squeeze/dependencies/akode/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/dependencies/akode/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,12 @@ debian/stamp-cvs-make: ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \ 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; \ fi endif diff --git a/ubuntu/maverick/dependencies/akode/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/dependencies/akode/debian/cdbs/debian-qt-kde.mk index 77998f744..106cba47d 100644 --- a/ubuntu/maverick/dependencies/akode/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/dependencies/akode/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,12 @@ debian/stamp-cvs-make: ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \ 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; \ fi endif -- cgit v1.2.3