Browse Source

Rename include subdirectory to tde

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
df182c709e
3 changed files with 10 additions and 10 deletions
  1. +2
    -2
      INSTALL
  2. +4
    -4
      admin/kde.py
  3. +4
    -4
      kde.py

+ 2
- 2
INSTALL View File

@@ -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



+ 4
- 4
admin/kde.py View File

@@ -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


+ 4
- 4
kde.py View File

@@ -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


Loading…
Cancel
Save