diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-10 23:20:57 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-10 23:20:57 -0500 |
| commit | 979b0c9a1ca30628cb4cff90e231ce973aaf6117 (patch) | |
| tree | 4abb89e7d6488d0990481c16538adf44fda352a6 | |
| parent | 3666c5839676a62b5e9b316f252d9957f8c5abb2 (diff) | |
| download | tdelibs-979b0c9a1ca30628cb4cff90e231ce973aaf6117.tar.gz tdelibs-979b0c9a1ca30628cb4cff90e231ce973aaf6117.zip | |
Update final HTML install path so all modules are consistent.
| -rw-r--r-- | doc/common/README.Doxygen | 2 | ||||
| -rw-r--r-- | tdecore/README.kiosk | 2 | ||||
| -rw-r--r-- | tdecore/kstandarddirs.cpp | 2 | ||||
| -rw-r--r-- | tdecore/kstandarddirs.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/common/README.Doxygen b/doc/common/README.Doxygen index 71da55823..183b85c36 100644 --- a/doc/common/README.Doxygen +++ b/doc/common/README.Doxygen @@ -57,7 +57,7 @@ doxygen.sh [--recurse] [--modulename] [--doxdatadir=<dir>] [--installdir=<dir>] --doxdatadir=<dir> Locate the HTML header files and support graphics. In tdelibs, the subdirectory doc/common/ contains these files (and this README). In an installed KDE system, - $TDEDIR/share/doc/HTML/en/common/ contains a copy. + $TDEDIR/share/doc/tde/HTML/en/common/ contains a copy. This argument is mandatory if doxygen.sh can't guess where the doxdata lives. --installdir=<dir> Locate the directory where apidox from other modules diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk index 927850f01..1133bee07 100644 --- a/tdecore/README.kiosk +++ b/tdecore/README.kiosk @@ -566,7 +566,7 @@ The following resources are defined: autostart - share/autostart data - share/apps -html - share/doc/HTML +html - share/doc/tde/HTML icon - share/icon config - share/config pixmap - share/pixmaps diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp index 229b84f9e..bce4bf4ca 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/kstandarddirs.cpp @@ -1030,7 +1030,7 @@ TQString KStandardDirs::kde_default(const char *type) { if (!strcmp(type, "html-bundle")) return "share/doc-bundle/HTML/"; if (!strcmp(type, "html")) - return "share/doc/kde/HTML/"; + return "share/doc/tde/HTML/"; if (!strcmp(type, "icon")) return "share/icons/"; if (!strcmp(type, "config")) diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h index e1e56bcb3..4dbd86560 100644 --- a/tdecore/kstandarddirs.h +++ b/tdecore/kstandarddirs.h @@ -57,7 +57,7 @@ class KStandardDirsPrivate; * may be even more. Under these prefixes there are several well * defined suffixes where specific resource types are to be found. * For example, for the resource type "html" the suffixes could be - * share/doc/HTML and share/doc/kde/HTML. + * share/doc/HTML and share/doc/tde/HTML. * So the search algorithm basically appends to each prefix each registered * suffix and tries to locate the file there. * To make the thing even more complex, it's also possible to register @@ -506,7 +506,7 @@ public: * of what this is all about. * * @li data - share/apps - * @li html - share/doc/HTML + * @li html - share/doc/tde/HTML * @li icon - share/icon * @li config - share/config * @li pixmap - share/pixmaps |