summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/tdeio-sword/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-02-13 16:41:43 +0100
committerSlávek Banko <slavek.banko@axis.cz>2016-02-27 01:11:48 +0100
commitac42a7af4f1f51616396aeb92c69bc6c8ede2d53 (patch)
tree7cf68f05d9a97aef74619212aeb357f91857197b /ubuntu/maverick/applications/tdeio-sword/debian
parentef300f2631545d45239ed23c60af6deaaf5358ef (diff)
downloadtde-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/tdeio-sword/debian')
-rw-r--r--ubuntu/maverick/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk5
-rwxr-xr-xubuntu/maverick/applications/tdeio-sword/debian/rules9
2 files changed, 12 insertions, 2 deletions
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
index d81e0a12f..32ba4acfb 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tdeio-sword/debian/rules b/ubuntu/maverick/applications/tdeio-sword/debian/rules
index bef973392..41a0fa49e 100755
--- a/ubuntu/maverick/applications/tdeio-sword/debian/rules
+++ b/ubuntu/maverick/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 && \