diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-02-13 16:41:43 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-07-14 15:43:32 +0200 |
| commit | 76f308b87dd26fe2fda32bcfc42a32945f8f11e7 (patch) | |
| tree | c21547b2bbcc3b7cc0de7c0a54c6986b7f91fc70 | |
| parent | 33085b98553a3a865b4bd6d8d9b7553cfa8b33ab (diff) | |
| download | tde-packaging-76f308b87dd26fe2fda32bcfc42a32945f8f11e7.tar.gz tde-packaging-76f308b87dd26fe2fda32bcfc42a32945f8f11e7.zip | |
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>
(cherry picked from commit 09b52dab01a59f21ce1966ef526a1f7d596b5427)
3 files changed, 15 insertions, 0 deletions
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 |