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