summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/kooldock
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-13 16:41:43 +0100
commit09b52dab01a59f21ce1966ef526a1f7d596b5427 (patch)
treed7b9120e6dc3e2fab50e70e8da9c53d5b404aef0 /ubuntu/maverick/applications/kooldock
parent9a4968b360913cf492d3783202e2a2e63bfff904 (diff)
downloadtde-packaging-09b52dab01a59f21ce1966ef526a1f7d596b5427.tar.gz
tde-packaging-09b52dab01a59f21ce1966ef526a1f7d596b5427.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>
Diffstat (limited to 'ubuntu/maverick/applications/kooldock')
-rw-r--r--ubuntu/maverick/applications/kooldock/debian/cdbs/debian-qt-kde.mk5
-rwxr-xr-xubuntu/maverick/applications/kooldock/debian/rules9
2 files changed, 12 insertions, 2 deletions
diff --git a/ubuntu/maverick/applications/kooldock/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kooldock/debian/cdbs/debian-qt-kde.mk
index d81e0a12f..32ba4acfb 100644
--- a/ubuntu/maverick/applications/kooldock/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kooldock/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/kooldock/debian/rules b/ubuntu/maverick/applications/kooldock/debian/rules
index bf5c42248..80d3fb248 100755
--- a/ubuntu/maverick/applications/kooldock/debian/rules
+++ b/ubuntu/maverick/applications/kooldock/debian/rules
@@ -19,10 +19,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
$(MAKE) -f admin/Makefile.common && \