diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2012-11-17 02:33:32 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-17 02:33:32 +0100 |
commit | 7c5d232eb26d4a925503f551a46965de870eefe7 (patch) | |
tree | 7c374e156bc228cc6d9c191ea48a294c7732b805 /ubuntu/precise/tdeartwork/debian/cdbs/kde.mk | |
parent | e747ba9c24732028ce543f6885900dbe513a4ffd (diff) | |
download | tde-packaging-7c5d232eb26d4a925503f551a46965de870eefe7.tar.gz tde-packaging-7c5d232eb26d4a925503f551a46965de870eefe7.zip |
Fix tdeartwork build issues on Debian and Ubuntu
Cdbs files modified to support both automake and cmake
Include files moved to default location
Removed now unnecessary patches
Diffstat (limited to 'ubuntu/precise/tdeartwork/debian/cdbs/kde.mk')
-rw-r--r-- | ubuntu/precise/tdeartwork/debian/cdbs/kde.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ubuntu/precise/tdeartwork/debian/cdbs/kde.mk b/ubuntu/precise/tdeartwork/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/precise/tdeartwork/debian/cdbs/kde.mk +++ b/ubuntu/precise/tdeartwork/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/%: |