From 593b74eb90c2cc749098762007e140d01b740268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 3 Nov 2013 17:02:15 +0100 Subject: Switch tdeaddons to cmake on Debian and Ubuntu --- ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk') diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk index 6b7b16643..26d768d1c 100644 --- a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk @@ -10,13 +10,15 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. 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 cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches @@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -106,6 +109,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif -- cgit v1.2.3