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> | 2016-02-27 01:11:48 +0100 |
| commit | ac42a7af4f1f51616396aeb92c69bc6c8ede2d53 (patch) | |
| tree | 7cf68f05d9a97aef74619212aeb357f91857197b /ubuntu/maverick/applications/tork/debian | |
| parent | ef300f2631545d45239ed23c60af6deaaf5358ef (diff) | |
| download | tde-packaging-ac42a7af4f1f51616396aeb92c69bc6c8ede2d53.tar.gz tde-packaging-ac42a7af4f1f51616396aeb92c69bc6c8ede2d53.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)
Diffstat (limited to 'ubuntu/maverick/applications/tork/debian')
| -rw-r--r-- | ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk | 5 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/tork/debian/rules | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk index f72df2152..b4b889c6d 100644 --- a/ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tork/debian/rules b/ubuntu/maverick/applications/tork/debian/rules index 38a29895e..36fed7dc5 100755 --- a/ubuntu/maverick/applications/tork/debian/rules +++ b/ubuntu/maverick/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 && \ |