diff options
author | Robert Xu <robxu9@gmail.com> | 2012-02-21 19:27:13 -0500 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2012-02-21 19:27:13 -0500 |
commit | 5d7b5e6defb05f81691d286d40f67260c4733d00 (patch) | |
tree | b2bfcca86b05179cad334dc61c5609e54ac7674d /ubuntu/maverick/applications/knights | |
parent | 580ce2082fe5054c9ad0e4f666cee9b4bfb2d0b6 (diff) | |
parent | a14ac9de2f5843036c9f452f1188979fef17ae6d (diff) | |
download | tde-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/knights')
-rw-r--r-- | ubuntu/maverick/applications/knights/debian/debiandirs | 2 | ||||
-rwxr-xr-x | ubuntu/maverick/applications/knights/debian/rules | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/applications/knights/debian/debiandirs b/ubuntu/maverick/applications/knights/debian/debiandirs index d341195a1..ba70ea3fb 100644 --- a/ubuntu/maverick/applications/knights/debian/debiandirs +++ b/ubuntu/maverick/applications/knights/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick/applications/knights/debian/rules b/ubuntu/maverick/applications/knights/debian/rules index d7e8330c7..fc447c09a 100755 --- a/ubuntu/maverick/applications/knights/debian/rules +++ b/ubuntu/maverick/applications/knights/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -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 @@ -51,7 +51,7 @@ config.status: configure patch if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/kde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/tde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib build: build-stamp |