diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2019-04-02 18:34:31 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2019-04-02 18:35:14 +0200 |
commit | 5d8ed1fab813d86b04383f7fcf8ab2c994cbea30 (patch) | |
tree | e072300414f678416995b666494da9a914656253 /ubuntu/maverick/applications/kdbusnotification/debian/cdbs | |
parent | 8c48ec0b95ce4133f916372eeb90ea507a7fa888 (diff) | |
download | tde-packaging-5d8ed1fab813d86b04383f7fcf8ab2c994cbea30.tar.gz tde-packaging-5d8ed1fab813d86b04383f7fcf8ab2c994cbea30.zip |
DEB kdbusnotification: Switch to cmake.
Switch to common TDE cdbs rules.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d24bd898174453b586ac90f2ef7a60165fa26fde)
Diffstat (limited to 'ubuntu/maverick/applications/kdbusnotification/debian/cdbs')
-rw-r--r-- | ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk | 4 | ||||
-rw-r--r-- | ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh @@ -18,6 +19,7 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh endif $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -110,6 +113,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: |