summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-11-24 09:58:29 +0100
committerFrancois Andriot <francois.andriot@free.fr>2012-11-24 09:58:29 +0100
commit4398af173f2663445e824a79c6367adab62c83e1 (patch)
treec478e10ad95d4b1bf18343e4f57f5764a52506e9 /ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
parent32fb770ae4ed0851491a59df5e23e27fb8afdadf (diff)
parent22fd5fa79ac6b2be02017b6d19d95555eae61efb (diff)
downloadtde-packaging-4398af173f2663445e824a79c6367adab62c83e1.tar.gz
tde-packaging-4398af173f2663445e824a79c6367adab62c83e1.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdesdk/debian/cdbs/kde.mk')
-rw-r--r--ubuntu/maverick/tdesdk/debian/cdbs/kde.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk b/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/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/%: