diff -Nurd robodoc-4.99.21-orig/Docs/makefile.in robodoc-4.99.21/Docs/makefile.in
--- robodoc-4.99.21-orig/Docs/makefile.in	2005-12-15 23:11:55.000000000 +0100
+++ robodoc-4.99.21/Docs/makefile.in	2006-04-05 18:01:16.000000000 +0200
@@ -46,8 +46,7 @@
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(manhdir)" "$(DESTDIR)$(docdir)"
-manhdir = $(mandir)/manh
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"
 NROFF = nroff
 MANS = $(man_MANS)
 docDATA_INSTALL = $(INSTALL_DATA)
@@ -122,9 +121,9 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-man_MANS = robodoc.1 robohdrs.1 manual.html
+man_MANS = robodoc.1 robohdrs.1
 # MAINTAINERCLEANFILES = robodoc.html stoc.html stoc.m4
-docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(prefix)/share/doc/$(PACKAGE)
 doc_DATA = manual.html
 all: all-am
 
@@ -204,51 +203,6 @@
 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
-install-manh: $(manh_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(manhdir)" || $(mkdir_p) "$(DESTDIR)$(manhdir)"
-	@list='$(manh_MANS) $(dist_manh_MANS) $(nodist_manh_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.h*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    h*) ;; \
-	    *) ext='h' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(manhdir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(manhdir)/$$inst"; \
-	done
-uninstall-manh:
-	@$(NORMAL_UNINSTALL)
-	@list='$(manh_MANS) $(dist_manh_MANS) $(nodist_manh_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.h*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    h*) ;; \
-	    *) ext='h' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(manhdir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(manhdir)/$$inst"; \
-	done
 install-docDATA: $(doc_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
@@ -304,7 +258,7 @@
 check: check-am
 all-am: makefile $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(manhdir)" "$(DESTDIR)$(docdir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -355,7 +309,7 @@
 
 install-info: install-info-am
 
-install-man: install-man1 install-manh
+install-man: install-man1
 
 installcheck-am:
 
@@ -377,18 +331,17 @@
 
 uninstall-am: uninstall-docDATA uninstall-info-am uninstall-man
 
-uninstall-man: uninstall-man1 uninstall-manh
+uninstall-man: uninstall-man1
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
 	install-docDATA install-exec install-exec-am install-info \
-	install-info-am install-man install-man1 install-manh \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-docDATA uninstall-info-am uninstall-man \
-	uninstall-man1 uninstall-manh
+	install-info-am install-man install-man1 install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA \
+	uninstall-info-am uninstall-man uninstall-man1
 
 
 # doc_DATA = main.css 
diff -Nurd robodoc-4.99.21-orig/Docs/manual.html robodoc-4.99.21/Docs/manual.html
--- robodoc-4.99.21-orig/Docs/manual.html	2005-12-15 21:42:53.000000000 +0100
+++ robodoc-4.99.21/Docs/manual.html	2006-04-05 18:24:18.000000000 +0200
@@ -630,7 +630,7 @@
     <code class="filename">robodoc.rc</code> file. If it can't find
     it there it will search in <code class="literal">$HOME/</code>, then
     <code class="filename">$HOMEDRIVE$HOMEPATH/</code>, and finally in
-    <code class="filename">/usr/share/robodoc/</code>.</p><p>With the <code class="option">--rc</code> option can tell ROBODoc to
+    <code class="filename">@PREFIX@/share/robodoc/</code>.</p><p>With the <code class="option">--rc</code> option can tell ROBODoc to
     use a different file then <code class="filename">robodoc.rc</code> as
     configuration file.  The is handy if you want to create
     documentation in different formats.  For instance: </p><pre class="programlisting">
diff -Nurd robodoc-4.99.21-orig/Docs/manual.xml robodoc-4.99.21/Docs/manual.xml
--- robodoc-4.99.21-orig/Docs/manual.xml	2005-12-15 23:11:00.000000000 +0100
+++ robodoc-4.99.21/Docs/manual.xml	2006-04-05 18:36:02.000000000 +0200
@@ -1,6 +1,6 @@
 <!DOCTYPE article
   PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" >
+ "@PREFIX@/share/xml/dtd/docbookx/4.2.0/docbookx.dtd" >
 <article lang="en">
 <!-- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> -->
 <articleinfo>
@@ -1208,7 +1208,7 @@
     <filename>robodoc.rc</filename> file. If it can't find
     it there it will search in <literal>$HOME/</literal>, then
     <filename>$HOMEDRIVE$HOMEPATH/</filename>, and finally in
-    <filename>/usr/share/robodoc/</filename>.</para>
+    <filename>@PREFIX@/share/robodoc/</filename>.</para>
 
     <para>With the <option>--rc</option> option can tell ROBODoc to
     use a different file then <filename>robodoc.rc</filename> as
diff -Nurd robodoc-4.99.21-orig/Docs/robodoc.1 robodoc-4.99.21/Docs/robodoc.1
--- robodoc-4.99.21-orig/Docs/robodoc.1	2005-12-05 23:12:43.000000000 +0100
+++ robodoc-4.99.21/Docs/robodoc.1	2006-04-05 18:36:47.000000000 +0200
@@ -165,7 +165,7 @@
 .SS "Example headers"
 .PP
 .nf
-\fI/usr/share/robodoc/Examples\fR
+\fI@PREFIX@/share/doc/robodoc/Examples\fR
 .fi
 
 .SH COPYRIGHT
diff -Nurd robodoc-4.99.21-orig/Source/roboconfig.c robodoc-4.99.21/Source/roboconfig.c
--- robodoc-4.99.21-orig/Source/roboconfig.c	2005-12-15 21:29:38.000000000 +0100
+++ robodoc-4.99.21/Source/roboconfig.c	2006-04-05 18:38:11.000000000 +0200
@@ -158,7 +158,7 @@
             }
             else
             {
-                char* sitespecific = "/usr/share/robodoc/";
+                char* sitespecific = "@PREFIX@/share/robodoc/";
 
                 if ( path ) {
                    free( path );
diff -Nurd robodoc-4.99.21-orig/makefile.in robodoc-4.99.21/makefile.in
--- robodoc-4.99.21-orig/makefile.in	2005-12-15 23:11:56.000000000 +0100
+++ robodoc-4.99.21/makefile.in	2006-04-05 18:09:39.000000000 +0200
@@ -149,7 +149,7 @@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = dist-zip
 SUBDIRS = Source Docs
-docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(prefix)/share/doc/$(PACKAGE)
 doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
 EXTRA_DIST = \
     Docs/robodoc.1 \