summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--languages/cpp/app_templates/kmake/src.pro2
-rw-r--r--languages/cpp/app_templates/kscons_kmdi/INSTALL4
-rw-r--r--languages/cpp/app_templates/kscons_kxt/INSTALL4
-rw-r--r--languages/cpp/includepathresolver.cpp2
-rw-r--r--parts/appwizard/common/scons/admin/kde.py8
5 files changed, 10 insertions, 10 deletions
diff --git a/languages/cpp/app_templates/kmake/src.pro b/languages/cpp/app_templates/kmake/src.pro
index 1bbea1fd..f15f3cca 100644
--- a/languages/cpp/app_templates/kmake/src.pro
+++ b/languages/cpp/app_templates/kmake/src.pro
@@ -6,7 +6,7 @@ KDELIB=$$system(kde-config --expandvars --install lib)
KDEBIN=$$system(kde-config --expandvars --install exe)
KDEAPPS=$$system(kde-config --expandvars --install apps)
KDEPREFIX=$$system(kde-config --prefix)
-KDEINCLUDE=$$KDEPREFIX/include/kde $$KDEPREFIX/include
+KDEINCLUDE=$$KDEPREFIX/include/tde $$KDEPREFIX/include
TEMPLATE = app
diff --git a/languages/cpp/app_templates/kscons_kmdi/INSTALL b/languages/cpp/app_templates/kscons_kmdi/INSTALL
index fa4f6763..798f33ff 100644
--- a/languages/cpp/app_templates/kscons_kmdi/INSTALL
+++ b/languages/cpp/app_templates/kscons_kmdi/INSTALL
@@ -57,9 +57,9 @@ before running "scons" and "scons install"
Here are some examples :
On Fedora/Redhat
-$ scons configure kdeincludes=/usr/include/kde/
+$ scons configure kdeincludes=/usr/include/tde/
On Debian
-$ scons configure qtincludes=/usr/include/qt/ kdeinclude=/usr/include/kde/
+$ scons configure qtincludes=/usr/include/qt/ kdeinclude=/usr/include/tde/
To install in some particular location with additional include paths
$ scons configure prefix=~/tmp extraincludes=/tmp/include:/usr/local/include
For AMD64 and platforms where folders are like /usr/lib64
diff --git a/languages/cpp/app_templates/kscons_kxt/INSTALL b/languages/cpp/app_templates/kscons_kxt/INSTALL
index fa4f6763..798f33ff 100644
--- a/languages/cpp/app_templates/kscons_kxt/INSTALL
+++ b/languages/cpp/app_templates/kscons_kxt/INSTALL
@@ -57,9 +57,9 @@ before running "scons" and "scons install"
Here are some examples :
On Fedora/Redhat
-$ scons configure kdeincludes=/usr/include/kde/
+$ scons configure kdeincludes=/usr/include/tde/
On Debian
-$ scons configure qtincludes=/usr/include/qt/ kdeinclude=/usr/include/kde/
+$ scons configure qtincludes=/usr/include/qt/ kdeinclude=/usr/include/tde/
To install in some particular location with additional include paths
$ scons configure prefix=~/tmp extraincludes=/tmp/include:/usr/local/include
For AMD64 and platforms where folders are like /usr/lib64
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index 964ff233..8cdeafb8 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -550,7 +550,7 @@ void IncludePathResolver::setOutOfSourceBuildSystem( const TQString& source, con
#ifdef TEST
/** This can be used for testing and debugging the system. To compile it use
- * gcc includepathresolver.cpp -I /usr/share/qt3/include -I /usr/include/kde -I ../../lib/util -DTEST -ltdecore -g -o includepathresolver
+ * gcc includepathresolver.cpp -I /usr/share/qt3/include -I /usr/include/tde -I ../../lib/util -DTEST -ltdecore -g -o includepathresolver
* */
int main(int argc, char **argv) {
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index 037b4af0..63be3e42 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -140,10 +140,10 @@ def detect_kde(env):
if os.path.isfile(kdeincludes + "/klineedit.h"):
print GREEN + "ok " + kdeincludes + NORMAL
else:
- if os.path.isfile(kdeprefix+"/include/kde/klineedit.h"):
+ if os.path.isfile(kdeprefix+"/include/tde/klineedit.h"):
# Debian, Fedora probably
- print YELLOW + "the kde headers were found in " + kdeprefix + "/include/kde/" + NORMAL
- kdeincludes = kdeprefix + "/include/kde/"
+ print YELLOW + "the kde headers were found in " + kdeprefix + "/include/tde/" + NORMAL
+ kdeincludes = kdeprefix + "/include/tde/"
else:
print RED + "The kde includes were NOT found" + NORMAL
env.Exit(1)
@@ -214,7 +214,7 @@ def generate(env):
"""+BOLD+"""* datadir """+NORMAL+""": install path for the data, ie: /usr/local/share
"""+BOLD+"""* libdir """+NORMAL+""": install path for the libs, ie: /usr/lib
"""+BOLD+"""* libsuffix """+NORMAL+""": suffix of libraries on amd64, ie: 64, 32
-"""+BOLD+"""* kdeincludes"""+NORMAL+""": path to the kde includes (/usr/include/kde on debian, ...)
+"""+BOLD+"""* kdeincludes"""+NORMAL+""": path to the kde includes (/usr/include/tde on debian, ...)
"""+BOLD+"""* qtincludes """+NORMAL+""": same punishment, for qt includes (/usr/include/qt on debian, ...)
"""+BOLD+"""* tdelibs """+NORMAL+""": path to the kde libs, for linking the programs
"""+BOLD+"""* qtlibs """+NORMAL+""": same punishment, for qt libraries