diff options
| author | Robert Xu <robxu9@gmail.com> | 2011-08-14 09:49:41 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2011-08-14 09:49:41 -0400 |
| commit | e8724f63ecf6c4b6ce612fd56ff81c27a028b70d (patch) | |
| tree | b2415e715455d59e9d5db36623c141267d3ebc2c /ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk | |
| parent | fe0db1142848776b89a32c25b4f23db22f5987df (diff) | |
| parent | cd9a7c5ac8336feceecc70a1f7cac6aefe5c370b (diff) | |
| download | tde-packaging-e8724f63ecf6c4b6ce612fd56ff81c27a028b70d.tar.gz tde-packaging-e8724f63ecf6c4b6ce612fd56ff81c27a028b70d.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk')
| -rw-r--r-- | ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk index 9dbcfbafd..5b6508f8c 100644 --- a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,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/" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox |