TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

DEB tdesshaskpass: Fix the support of Ninja build.

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/268/head
Slávek Banko 11 months ago
parent d27d96965c
commit 3fcddc7156
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File

11
debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk vendored
Unescape View File

@ -57,6 +57,15 @@ ifndef _cdbs_class_cmake
include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
endif 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 ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches DEB_PATCHDIRS := debian/patches/common debian/patches
endif endif
@ -219,7 +228,7 @@ debian/stamp-kde-apidox:
common-install-indep:: common-install-kde-apidox common-install-indep:: common-install-kde-apidox
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:: cleanbuilddir::
-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))

11
ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
Unescape View File

@ -57,6 +57,15 @@ ifndef _cdbs_class_cmake
include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
endif 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 ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches DEB_PATCHDIRS := debian/patches/common debian/patches
endif endif
@ -219,7 +228,7 @@ debian/stamp-kde-apidox:
common-install-indep:: common-install-kde-apidox common-install-indep:: common-install-kde-apidox
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:: cleanbuilddir::
-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))

Write Preview
Loading…
Cancel
Save