diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-04-27 16:02:42 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-04-27 16:02:42 +0200 |
| commit | e5d2ea6d0cd5e9b97fedaa32c38c9b9743c1dfd2 (patch) | |
| tree | ed848ca31dfaaff8fa2bbdfa7bacc2018d3cba19 | |
| parent | 96fe7f141b2b5b68e9e194ab255b454036a322c5 (diff) | |
| download | tde-packaging-e5d2ea6d0cd5e9b97fedaa32c38c9b9743c1dfd2.tar.gz tde-packaging-e5d2ea6d0cd5e9b97fedaa32c38c9b9743c1dfd2.zip | |
DEB dbus-1-tqt: Fix apidox build invocation to be just for build-indep.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 files changed, 4 insertions, 28 deletions
diff --git a/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-qt-kde.mk b/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-qt-kde.mk index 3bd77b8f7..c1f7ae0a9 100644 --- a/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-qt-kde.mk +++ b/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-qt-kde.mk @@ -96,8 +96,6 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: clean:: rm -f debian/stamp-cvs-make -endif - common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) @@ -109,3 +107,5 @@ common-install-kde-apidox:: clean:: rm -f debian/stamp-kde-apidox + +endif diff --git a/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/kde.mk b/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/kde.mk index f5d237249..818730f18 100644 --- a/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/kde.mk +++ b/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/kde.mk @@ -68,18 +68,6 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: cleanbuilddir:: -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) -common-build-arch common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -common-install-arch common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) - -clean:: - rm -f debian/stamp-kde-apidox - # This is a convenience target for calling manually. It's not part of # the build process. buildprep: clean apply-patches diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-qt-kde.mk index 3bd77b8f7..c1f7ae0a9 100644 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-qt-kde.mk @@ -96,8 +96,6 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: clean:: rm -f debian/stamp-cvs-make -endif - common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) @@ -109,3 +107,5 @@ common-install-kde-apidox:: clean:: rm -f debian/stamp-kde-apidox + +endif diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/kde.mk b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/kde.mk index f5d237249..818730f18 100644 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/kde.mk +++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/kde.mk @@ -68,18 +68,6 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: cleanbuilddir:: -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) -common-build-arch common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -common-install-arch common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) - -clean:: - rm -f debian/stamp-kde-apidox - # This is a convenience target for calling manually. It's not part of # the build process. buildprep: clean apply-patches |