diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-10-26 13:27:50 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-26 13:27:50 +0200 |
| commit | 8c65bc40c6ab7da5aab6e5817faa6993cd66f2cc (patch) | |
| tree | 701978eda22f0b87cc945ec7fc89067a7a31fe7c /ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk | |
| parent | dd1b9be2bb5a07477f83925f5b568f696fc4ad23 (diff) | |
| download | tde-packaging-8c65bc40c6ab7da5aab6e5817faa6993cd66f2cc.tar.gz tde-packaging-8c65bc40c6ab7da5aab6e5817faa6993cd66f2cc.zip | |
Fix tdenetwork 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
Fix unwanted rename icon with automake
Diffstat (limited to 'ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk')
| -rw-r--r-- | ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk b/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdenetwork/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/%: |