summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2023-12-19 14:25:34 +0100
committerSlávek Banko <slavek.banko@axis.cz>2023-12-19 14:25:34 +0100
commit3fcddc7156e1ec7b34d9133ae32f676c8ed6e437 (patch)
treea00ceb78669c5289bd92ee0ac0d38dcc4eec1285
parentd27d96965cbed78a7a548e26636f7e5c8cad03c2 (diff)
downloadtde-packaging-3fcddc7156e1ec7b34d9133ae32f676c8ed6e437.tar.gz
tde-packaging-3fcddc7156e1ec7b34d9133ae32f676c8ed6e437.zip
DEB tdesshaskpass: Fix the support of Ninja build.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk11
-rw-r--r--ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk11
2 files changed, 20 insertions, 2 deletions
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
index d2559d66e..aba508624 100644
--- a/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/tdesshaskpass/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
@@ -219,7 +228,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/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
index d2559d66e..aba508624 100644
--- a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/tdesshaskpass/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
@@ -219,7 +228,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))