From df182c709e6ebcff3dda49e981204d421b672230 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Feb 2012 18:16:36 -0600 Subject: [PATCH] Rename include subdirectory to tde --- INSTALL | 4 ++-- admin/kde.py | 8 ++++---- kde.py | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/INSTALL b/INSTALL index 4f763d3..2502239 100644 --- a/INSTALL +++ b/INSTALL @@ -57,9 +57,9 @@ have to give those paths. 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 diff --git a/admin/kde.py b/admin/kde.py index 736cdf8..50be00c 100644 --- a/admin/kde.py +++ b/admin/kde.py @@ -143,10 +143,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) @@ -251,7 +251,7 @@ def generate(env): """+BOLD+"""* execprefix """+NORMAL+""": install path for binaries, ie: /usr/bin """+BOLD+"""* datadir """+NORMAL+""": install path for the data, ie: /usr/local/share """+BOLD+"""* libdir """+NORMAL+""": install path for the libs, ie: /usr/lib -"""+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 diff --git a/kde.py b/kde.py index 83c660a..1022c1f 100644 --- a/kde.py +++ b/kde.py @@ -156,10 +156,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) @@ -231,7 +231,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