summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/tdmtheme/debian
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
committerRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
commit5d7b5e6defb05f81691d286d40f67260c4733d00 (patch)
treeb2bfcca86b05179cad334dc61c5609e54ac7674d /ubuntu/maverick/applications/tdmtheme/debian
parent580ce2082fe5054c9ad0e4f666cee9b4bfb2d0b6 (diff)
parenta14ac9de2f5843036c9f452f1188979fef17ae6d (diff)
downloadtde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.tar.gz
tde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/tdmtheme/debian')
-rw-r--r--ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick/applications/tdmtheme/debian/rules4
2 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
@@ -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/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/rules b/ubuntu/maverick/applications/tdmtheme/debian/rules
index 0eb4fad95..8e74fc2cb 100755
--- a/ubuntu/maverick/applications/tdmtheme/debian/rules
+++ b/ubuntu/maverick/applications/tdmtheme/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap