diff options
| author | Slávek Banko <[email protected]> | 2023-12-19 14:25:34 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2023-12-19 15:58:17 +0100 |
| commit | a006276e3027f062d21aad2523e78b70d8d7d318 (patch) | |
| tree | 46d7afb685b1678e11d3e891736b305d966389be /ubuntu | |
| parent | 03143bf8ea025868e1e31af2d83a8cc1bc287875 (diff) | |
| download | tde-packaging-a006276e3027f062d21aad2523e78b70d8d7d318.tar.gz tde-packaging-a006276e3027f062d21aad2523e78b70d8d7d318.zip | |
DEB tdesshaskpass: Fix the support of Ninja build.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 3fcddc7156e1ec7b34d9133ae32f676c8ed6e437)
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk | 11 |
1 files changed, 10 insertions, 1 deletions
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)) |