summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-11 12:07:00 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-09-08 15:30:32 +0200
commit7adbffac94053c16ba5c4ca2ae2e975518302706 (patch)
tree6fbeadf5ae122e58a159c95bc4cb7260ace90b29
parent3000d0c09d8c85a2f69d46d2f36a53daeb644712 (diff)
downloadtdevelop-7adbffac94053c16ba5c4ca2ae2e975518302706.tar.gz
tdevelop-7adbffac94053c16ba5c4ca2ae2e975518302706.zip
Update HTML install path references.
(cherry picked from commit 7e28a2cd0e6663c45848f47fff28365466a5dc87)
-rw-r--r--Doxyfile24
-rw-r--r--doc/kdevelop/kdevelop-install.docbook4
-rw-r--r--doc/kdevelop/setup.docbook4
-rw-r--r--kdevelop.m4.in8
4 files changed, 20 insertions, 20 deletions
diff --git a/Doxyfile b/Doxyfile
index dab5ec24..bcf2be0d 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -230,18 +230,18 @@ SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
# Configuration::additions related to external references
#---------------------------------------------------------------------------
-TAGFILES = $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/dcop/dcop.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/dcop/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/interfaces/interfaces.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/interfaces/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kdecore/kdecore.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kdecore/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kdefx/kdefx.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kdefx/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kdeui/kdeui.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kdeui/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/khtml/khtml.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/khtml/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kio/kio.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kio/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kjs/kjs.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kjs/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kparts/kparts.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kparts/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kmdi/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kutils/kutils.tag=$(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/kutils/html/ \
- $(KDEDIR)/share/doc/HTML/en/kdelibs-apidocs/qt/qt.tag=$(QTDIR)/doc/html
+TAGFILES = $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/dcop/dcop.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/dcop/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/interfaces/interfaces.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/interfaces/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kdecore/kdecore.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kdecore/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kdefx/kdefx.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kdefx/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kdeui/kdeui.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kdeui/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/khtml/khtml.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/khtml/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kio/kio.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kio/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kjs/kjs.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kjs/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kparts/kparts.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kparts/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kmdi/kmdi.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kmdi/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kutils/kutils.tag=$(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/kutils/html/ \
+ $(KDEDIR)/share/doc/tde/HTML/en/kdelibs-apidocs/qt/qt.tag=$(QTDIR)/doc/html
GENERATE_TAGFILE =
ALLEXTERNALS = NO
EXTERNAL_GROUPS = NO
diff --git a/doc/kdevelop/kdevelop-install.docbook b/doc/kdevelop/kdevelop-install.docbook
index 028f5e10..e363b9a5 100644
--- a/doc/kdevelop/kdevelop-install.docbook
+++ b/doc/kdevelop/kdevelop-install.docbook
@@ -539,7 +539,7 @@ If you want to build your own <link linkend="make-api">API documentation</link>
</para>
<informalexample><simplelist>
<member><prompt>~/trinitysrc/kdevelop&gt; </prompt>
- <userinput>./configure --</userinput>(options-as-above) <userinput>\</userinput></member> <member><userinput>--with-kdelibsdoxy-dir=$KDEDIR/share/doc/HTML/en/kdelibs-apidocs</userinput></member>
+ <userinput>./configure --</userinput>(options-as-above) <userinput>\</userinput></member> <member><userinput>--with-kdelibsdoxy-dir=$KDEDIR/share/doc/tde/HTML/en/kdelibs-apidocs</userinput></member>
</simplelist></informalexample>
</note>
</listitem>
@@ -711,7 +711,7 @@ Alas, this version is best used read-only over the internet. If you do not alway
<userinput>./configure --</userinput>(options-as-usual)<userinput> \</userinput>
</member>
<member>
- <userinput>--with-kdelibsdoxy-dir=$KDEDIR/share/doc/HTML/en/kdelibs-apidocs</userinput>
+ <userinput>--with-kdelibsdoxy-dir=$KDEDIR/share/doc/tde/HTML/en/kdelibs-apidocs</userinput>
</member>
</simplelist></informalexample>
diff --git a/doc/kdevelop/setup.docbook b/doc/kdevelop/setup.docbook
index e5449a99..30fac252 100644
--- a/doc/kdevelop/setup.docbook
+++ b/doc/kdevelop/setup.docbook
@@ -1600,7 +1600,7 @@ In short, such an &API; documents the interface to certain library functions. Th
There are some structural constraints assumed when searching for &doxygen; generated &API; documentation. The directory in which the <filename>index.html</filename> file resides should contain subdirectories with separate documentation collections. Each of these subdirectories is assumed to contain a <filename>.tag</filename> file and a <filename class="directory">html/</filename> subdirectory.
</para>
<para>
-You may have a look at <filename class="directory">$<envar>KDEDIR</envar>/share/doc/HTML/en/kdelibs-apidocs</filename> for an example of such a &doxygen; &API; documentation layout.
+You may have a look at <filename class="directory">$<envar>KDEDIR</envar>/share/doc/tde/HTML/en/kdelibs-apidocs</filename> for an example of such a &doxygen; &API; documentation layout.
</para>
<note><para>
@@ -1621,7 +1621,7 @@ The older &kde; <ulink url="http://sirtaj.net/projects/kdoc/">KDoc</ulink> gener
Or the <command>configure</command> command did automatically find a &doxygen; generated &kde; Libraries &API; in one of several standard locations it knows of.
</para></listitem>
<listitem><para>
- Or as a last resort the <filename class="directory">$<envar>KDEDIR</envar>/share/doc/HTML/en/kdelibs-apidocs/</filename> was found at the first &kdevelop; startup.
+ Or as a last resort the <filename class="directory">$<envar>KDEDIR</envar>/share/doc/tde/HTML/en/kdelibs-apidocs/</filename> was found at the first &kdevelop; startup.
</para></listitem>
</itemizedlist>
diff --git a/kdevelop.m4.in b/kdevelop.m4.in
index 33d2c912..3fe2e6bb 100644
--- a/kdevelop.m4.in
+++ b/kdevelop.m4.in
@@ -48,9 +48,9 @@ kdelibs_doxydirs=""
)
if test "${prefix}" = NONE; then
- ac_kde_htmldir="$ac_default_prefix"/share/doc/HTML
+ ac_kde_htmldir="$ac_default_prefix"/share/doc/tde/HTML
else
- ac_kde_htmldir="$prefix"/share/doc/HTML
+ ac_kde_htmldir="$prefix"/share/doc/tde/HTML
fi
kdelibs_doxydirs="$ac_kdelibs_doxydirs $ac_kde_htmldir/default/kdelibs-apidocs $ac_kde_htmldir/en/kdelibs-apidocs"
@@ -82,9 +82,9 @@ kdelibs_docdirs=""
)
if test "${prefix}" = NONE; then
- ac_kde_htmldir="$ac_default_prefix"/share/doc/HTML
+ ac_kde_htmldir="$ac_default_prefix"/share/doc/tde/HTML
else
- ac_kde_htmldir="$prefix"/share/doc/HTML
+ ac_kde_htmldir="$prefix"/share/doc/tde/HTML
fi
kdelibs_docdirs="/usr/doc/kdelibs-doc/html"