Rename include subdirectory to tde

acinclude.m4

@@ -1793,8 +1793,8 @@ fi
 
 if test -z "$1"; then
 
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
-test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  kde_cxxflags_safe="$CXXFLAGS"
 
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
  AC_TRY_LINK([

config.log

@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
-  $ ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=x86_64-linux-gnu --build=x86_64-linux-gnu --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+  $ ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=x86_64-linux-gnu --build=x86_64-linux-gnu --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 ## --------- ##
 ## Platform. ##

kdiff3plugin/po/Makefile

@@ -104,7 +104,7 @@ KCONFIG_COMPILER = /usr/bin/kconfig_compiler
 KDECONFIG = /usr/bin/kde-config
 KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
 KDE_EXTRA_RPATH = 
-KDE_INCLUDES = -I/usr/include/kde
+KDE_INCLUDES = -I/usr/include/tde
 KDE_LDFLAGS = -L/usr/lib
 KDE_MT_LDFLAGS = 
 KDE_MT_LIBS = -lpthread
@@ -212,7 +212,7 @@ X_RPATH =
 ac_ct_CC = 
 ac_ct_CXX = 
 ac_ct_F77 = 
-all_includes = -I/usr/include/kde -I/usr/include/qt3 -I. 
+all_includes = -I/usr/include/tde -I/usr/include/qt3 -I. 
 all_libraries = -L/usr/share/qt3/lib -L/usr/lib   
 am__fastdepCC_FALSE = #
 am__fastdepCC_TRUE = 
@@ -255,7 +255,7 @@ kde_confdir = ${datadir}/config
 kde_datadir = ${datadir}/apps
 kde_htmldir = ${datadir}/doc/HTML
 kde_icondir = ${datadir}/icons
-kde_includes = /usr/include/kde
+kde_includes = /usr/include/tde
 kde_kcfgdir = ${datadir}/config.kcfg
 kde_libraries = /usr/lib
 kde_libs_htmldir = /usr/share/doc/kde/HTML