summaryrefslogtreecommitdiffstats
path: root/debian/lenny/kdetoys/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:28:38 +0100
commit71a469d933b65f3ef17981f6d31855ef4c1201b3 (patch)
treec29d65bc29afc589b9d723b0d33c410ef214792e /debian/lenny/kdetoys/debian/cdbs/kde.mk
parentaeb0d2bd8c5a6020109e9ae868afe8b52a41bff0 (diff)
downloadtde-packaging-71a469d933b65f3ef17981f6d31855ef4c1201b3.tar.gz
tde-packaging-71a469d933b65f3ef17981f6d31855ef4c1201b3.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 (cherry picked from commit 4cfcb3723c113b840e13e198e33a3a512b55169f)
Diffstat (limited to 'debian/lenny/kdetoys/debian/cdbs/kde.mk')
-rw-r--r--debian/lenny/kdetoys/debian/cdbs/kde.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/lenny/kdetoys/debian/cdbs/kde.mk b/debian/lenny/kdetoys/debian/cdbs/kde.mk
index 918490180..023886fc8 100644
--- a/debian/lenny/kdetoys/debian/cdbs/kde.mk
+++ b/debian/lenny/kdetoys/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/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: