summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/tdetoys/debian/cdbs/kde.mk
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-11-18 17:25:13 +0100
committerSlávek Banko <slavek.banko@axis.cz>2012-11-18 17:25:13 +0100
commit4cfcb3723c113b840e13e198e33a3a512b55169f (patch)
tree364629e234b91373b4cb0283e98a0f3320410be4 /ubuntu/precise/tdetoys/debian/cdbs/kde.mk
parent72dc4d5ff96a1f84d7f1ce8f0c1a5481822161a9 (diff)
downloadtde-packaging-4cfcb3723c113b840e13e198e33a3a512b55169f.tar.gz
tde-packaging-4cfcb3723c113b840e13e198e33a3a512b55169f.zip
Fix tdetoys build issues on Debian and Ubuntu
Cdbs files modified to support both automake and cmake Removed unnecessary files installed into doc Include files moved to default location
Diffstat (limited to 'ubuntu/precise/tdetoys/debian/cdbs/kde.mk')
-rw-r--r--ubuntu/precise/tdetoys/debian/cdbs/kde.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/ubuntu/precise/tdetoys/debian/cdbs/kde.mk b/ubuntu/precise/tdetoys/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/precise/tdetoys/debian/cdbs/kde.mk
+++ b/ubuntu/precise/tdetoys/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/%: