diff options
Diffstat (limited to 'debian/_base/libraries/libtdeldap/debian')
-rw-r--r-- | debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk | 11 | ||||
-rw-r--r-- | debian/_base/libraries/libtdeldap/debian/control | 2 | ||||
-rw-r--r-- | debian/_base/libraries/libtdeldap/debian/docs | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk index 5b4e8bfd7..f36e3527c 100644 --- a/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk @@ -57,6 +57,15 @@ ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) endif +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches endif @@ -214,7 +223,7 @@ debian/stamp-kde-apidox: common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) cleanbuilddir:: -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) diff --git a/debian/_base/libraries/libtdeldap/debian/control b/debian/_base/libraries/libtdeldap/debian/control index 72eed5aed..f3b40b54f 100644 --- a/debian/_base/libraries/libtdeldap/debian/control +++ b/debian/_base/libraries/libtdeldap/debian/control @@ -2,7 +2,7 @@ Source: libtdeldap-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libldap2-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev Standards-Version: 3.8.4 Package: libtdeldap-trinity diff --git a/debian/_base/libraries/libtdeldap/debian/docs b/debian/_base/libraries/libtdeldap/debian/docs index 62deb0497..0b6e0f321 100644 --- a/debian/_base/libraries/libtdeldap/debian/docs +++ b/debian/_base/libraries/libtdeldap/debian/docs @@ -1 +1,2 @@ AUTHORS +README.md |