diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-02-22 00:59:29 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-02-27 01:12:19 +0100 |
| commit | 47a2965ada58d04968036d87d39d7056c827e3ab (patch) | |
| tree | 3fca3613bf1540dd6674215851a60785a48039c4 | |
| parent | ac42a7af4f1f51616396aeb92c69bc6c8ede2d53 (diff) | |
| download | tde-packaging-47a2965ada58d04968036d87d39d7056c827e3ab.tar.gz tde-packaging-47a2965ada58d04968036d87d39d7056c827e3ab.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 bba0f67b18d8efc8c625e2ba7e0c11a93b1c7fd7)
3 files changed, 21 insertions, 6 deletions
diff --git a/debian/lenny/applications/kaffeine-mozilla/debian/rules b/debian/lenny/applications/kaffeine-mozilla/debian/rules index 51d9c565f..228818f36 100755 --- a/debian/lenny/applications/kaffeine-mozilla/debian/rules +++ b/debian/lenny/applications/kaffeine-mozilla/debian/rules @@ -92,10 +92,15 @@ clean: dh_testdir dh_testroot - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh 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 ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh ltmain.sh +endif aclocal automake --add-missing diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/rules b/debian/squeeze/applications/kaffeine-mozilla/debian/rules index 51d9c565f..228818f36 100755 --- a/debian/squeeze/applications/kaffeine-mozilla/debian/rules +++ b/debian/squeeze/applications/kaffeine-mozilla/debian/rules @@ -92,10 +92,15 @@ clean: dh_testdir dh_testroot - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh 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 ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh ltmain.sh +endif aclocal automake --add-missing diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules index 51d9c565f..228818f36 100755 --- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules +++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules @@ -92,10 +92,15 @@ clean: dh_testdir dh_testroot - ! [ -f /usr/share/libtool/ltmain.sh ] || \ +ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" cp -f /usr/share/libtool/ltmain.sh 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 ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -f /usr/share/libtool/build-aux/ltmain.sh ltmain.sh +endif aclocal automake --add-missing |