Merge branch 'master' into feature/buildsystem_rewrite

Conflicts:
	.gitignore
	autogen.sh
	configure.in
	doc/Makefile.am
	examples/cppunittest/TestAssertTest.cpp

3 files changed, 7 insertions, 15 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2a488f7..d0c25ee 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,11 @@
 .PHONY: install-data-hook uninstall-local clean-local
 
+htmldir=
+html_DATA=
+
 if DOC
-html_DATA = html/index.html
+htmldir += $(pkgdatadir)/html
+html_DATA += $(static_pages) html/index.html
 
 install-data-hook:
 	cp -pR html/* $(DESTDIR)$(htmldir)
diff --git a/doc/footer.html b/doc/footer.html
index 448359e..423964e 100644
--- a/doc/footer.html
+++ b/doc/footer.html
@@ -1,20 +1,11 @@
 <hr>
 <table width="100%">
   <tr>
-    <td width="10%" align="left" valign="center">
-      <a href="http://sourceforge.net"> 
-      <img
-      src="http://sourceforge.net/sflogo.php?group_id=11795"
-      width="88" height="31" border="0" alt="SourceForge Logo"></a>
-    </td>
-    <td width="20%" align="left" valign="center">
-      hosts this site.
-    </td>
     <td>
     </td>
     <td align="right" valign="center">
       Send comments to:<br>
-      <a href="mailto:cppunit-devel@lists.sourceforge.net">CppUnit Developers</a>
+      <a href="mailto:libreoffice@lists.freedesktop.org">CppUnit Developers</a>
     </td>
   </tr>
 </table>
diff --git a/doc/header.html b/doc/header.html
index 01cf932..8cf6dfe 100644
--- a/doc/header.html
+++ b/doc/header.html
@@ -11,16 +11,13 @@ CppUnit - The Unit Testing Library
 <table width="100%">
   <tr>
     <td width="40%" align="left" valign="center">
-      <a href="http://sourceforge.net/projects/cppunit">
+      <a href="http://www.freedesktop.org/wiki/Software/cppunit">
       CppUnit project page
       </a>
     </td>
     <td>
       <a href="FAQ">FAQ</a>
     </td>
-    <td width="40%" align="right" valign="center">
-      <a href="http://cppunit.sourceforge.net">CppUnit home page</a>
-    </td>
   </tr>
 </table>