aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-03 22:29:24 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-03 22:29:24 +0000
commitc03ef69be275228214d8b22dbfe66c60701e72ba (patch)
tree1637094107904162d20551e836d6db45e5c1a742
parentab61e6baa1913d264380af587675e8eaeaff2d06 (diff)
downloadpaludis-c03ef69be275228214d8b22dbfe66c60701e72ba.tar.gz
paludis-c03ef69be275228214d8b22dbfe66c60701e72ba.tar.xz
Work around various Doxygen stupidities
-rw-r--r--doc/Makefile.am10
-rw-r--r--doc/doc_authors.doxygen2
-rw-r--r--doc/doc_changelog.doxygen2
-rw-r--r--doc/doc_licence.doxygen2
-rw-r--r--doc/doc_news.doxygen2
-rw-r--r--doc/footer.html2
-rw-r--r--doc/header.html8
-rw-r--r--doc/htaccess4
8 files changed, 19 insertions, 13 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2c13c03..98d71d1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,7 +22,7 @@ docfiles = \
doc_programming_with_paludis.doxygen \
doc_cache_files.doxygen
-EXTRA_DIST = doxygen.conf.in header.html footer.html paludis.css $(docfiles) $(tagfiles)
+EXTRA_DIST = doxygen.conf.in header.html footer.html paludis.css $(docfiles) $(tagfiles) htaccess
CLEANFILES = *~ html/* html
MAINTAINERCLEANFILES = Makefile.in $(tagfiles)
@@ -32,10 +32,13 @@ libstdc++.tag :
libwrapiter.tag :
wget -O $@ http://libwrapiter.berlios.de/libwrapiter.tag
+copy-htaccess : htaccess
+ cp htaccess html/.htaccess
+
if HAVE_DOXYGEN
doxygen : doxygen.conf $(top_srcdir)/paludis/*.cc $(top_srcdir)/paludis/*.hh \
- $(docfiles) $(tagfiles)
+ $(docfiles) $(tagfiles) copy-htaccess
$(MAKE) -C .. built-sources
doxygen doxygen.conf
@@ -58,10 +61,9 @@ maintainer-clean-local :
find html/ -type f | grep -v '\.svn' | xargs rm
upload-homepage : doxygen
- cd `readlink -f $(top_srcdir)/doc/html` && tar jc ./ | \
+ cd `readlink -f $(top_srcdir)/doc/html` && tar jc ./ --exclude ./ | \
ssh shell.berlios.de tar vjx -C /home/groups/paludis/htdocs/
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/doc/doc_authors.doxygen b/doc/doc_authors.doxygen
index 8d9d855..54066fc 100644
--- a/doc/doc_authors.doxygen
+++ b/doc/doc_authors.doxygen
@@ -1,7 +1,7 @@
/* vim: set ft=cpp tw=80 sw=4 et : */
/**
-\page Authors Authors
+\page PaludisAuthors Paludis Authors
\verbinclude AUTHORS
diff --git a/doc/doc_changelog.doxygen b/doc/doc_changelog.doxygen
index 7d387e2..5bb1c0b 100644
--- a/doc/doc_changelog.doxygen
+++ b/doc/doc_changelog.doxygen
@@ -1,7 +1,7 @@
/* vim: set ft=cpp tw=80 sw=4 et : */
/**
-\page ChangeLog ChangeLog
+\page PaludisChangeLog Paludis ChangeLog
\verbinclude ChangeLog
diff --git a/doc/doc_licence.doxygen b/doc/doc_licence.doxygen
index f1938f5..85f85bb 100644
--- a/doc/doc_licence.doxygen
+++ b/doc/doc_licence.doxygen
@@ -1,7 +1,7 @@
/* vim: set ft=cpp tw=80 sw=4 et : */
/**
-\page Licence Licence
+\page PaludisLicence Paludis Licence
Paludis is distributed under the terms of the GNU General Public Licence,
version 2.
diff --git a/doc/doc_news.doxygen b/doc/doc_news.doxygen
index 4914a90..990eae5 100644
--- a/doc/doc_news.doxygen
+++ b/doc/doc_news.doxygen
@@ -1,7 +1,7 @@
/* vim: set ft=cpp tw=80 sw=4 et : */
/**
-\page News News
+\page PaludisNews Paludis News
\verbinclude NEWS
diff --git a/doc/footer.html b/doc/footer.html
index 8cd5215..8ec5307 100644
--- a/doc/footer.html
+++ b/doc/footer.html
@@ -1,5 +1,5 @@
<div class="qindex" style="text-align: center; margin-top: 1em;">
- <p>Copyright &copy; 2005, 2006 <a href="http://ciaranm.org/">Ciaran McCreesh</a> and various others. See the <a href="Authors.html">Authors list</a> and <a href="Licence.html">Licence</a> for details and redistribution conditions.</p>
+ <p>Copyright &copy; 2005, 2006 <a href="http://ciaranm.org/">Ciaran McCreesh</a> and various others. See the <a href="PaludisAuthors.html">Authors list</a> and <a href="PaludisLicence.html">Licence</a> for details and redistribution conditions.</p>
<table style="border-style: none; margin: auto;">
<tr>
<td style="text-align: center; padding: 2px 50px;"><a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" border="0"></a></td>
diff --git a/doc/header.html b/doc/header.html
index 4ffaa72..da1822b 100644
--- a/doc/header.html
+++ b/doc/header.html
@@ -8,10 +8,10 @@
<body>
<div class="qindex">About Paludis: [
<a class="qindex" href="index.html">Paludis&nbsp;Homepage</a> |
- <a class="qindex" href="News.html">News</a> |
- <a class="qindex" href="ChangeLog.html">ChangeLog</a> |
- <a class="qindex" href="Licence.html">Licence</a> |
- <a class="qindex" href="Authors.html">Authors</a> |
+ <a class="qindex" href="PaludisNews.html">News</a> |
+ <a class="qindex" href="PaludisChangeLog.html">ChangeLog</a> |
+ <a class="qindex" href="PaludisLicence.html">Licence</a> |
+ <a class="qindex" href="PaludisAuthors.html">Authors</a> |
<a class="qindex" href="https://developer.berlios.de/projects/paludis/">Berlios&nbsp;Project</a> |
<a class="qindex" href="https://developer.berlios.de/project/showfiles.php?group_id=6360">Download</a> |
<a class="qindex" href="http://svn.pioto.org/viewvc/paludis/">SVN</a> ]
diff --git a/doc/htaccess b/doc/htaccess
new file mode 100644
index 0000000..e7a4e4a
--- /dev/null
+++ b/doc/htaccess
@@ -0,0 +1,4 @@
+Redirect permanent /ChangeLog.html /PaludisChangeLog.html
+Redirect permanent /News.html /PaludisNews.html
+Redirect permanent /Licence.html /PaludisLicence.html
+Redirect permanent /Authors.html /PaludisAuthors.html