diff options
| author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 20:37:58 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 20:37:58 +0100 |
| commit | 413e1748b4f6634573311f24e9cce4ad099d9f15 (patch) | |
| tree | 453a30388e10d148aa1f05c9dc1f89d6283e8dda /ubuntu/maverick/applications/kdiff3 | |
| parent | 79b18e9f0f943ca0c3a60e5c6a24a3a0d0afad5d (diff) | |
| parent | 784405e8180ea3d82b9c983dc6980b395a10099b (diff) | |
| download | tde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.tar.gz tde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/kdiff3')
| -rw-r--r-- | ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk | 2 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/kdiff3/debian/rules | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kdiff3/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/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules index 90b33c108..e76778235 100755 --- a/ubuntu/maverick/applications/kdiff3/debian/rules +++ b/ubuntu/maverick/applications/kdiff3/debian/rules @@ -4,7 +4,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 @@ -37,7 +37,7 @@ config.status: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs - CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp |