Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -15,5 +15,4 @@ SUBDIRS=src include
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = frei0r.pc
 
-docsdir = ${prefix}/share/doc/${PACKAGE}
-docs_DATA = README ChangeLog TODO AUTHORS 
+doc_DATA = README ChangeLog TODO AUTHORS COPYING
Index: doc/Makefile.am
===================================================================
--- doc/Makefile.am.orig
+++ doc/Makefile.am
@@ -13,7 +13,7 @@ html:
 
 htmldocs_DATA = html
 
-htmldocsdir=${prefix}/share/doc/${PACKAGE}
+htmldocsdir=${docdir}
 
 clean:
 	rm -rf html
@@ -22,10 +22,10 @@ dist-hook:
 	-cp -ra html $(distdir)/doc/
 
 install-data:
-	install -c -m 644 -d $(htmldocs_DATA) $(htmldocsdir)
+	install -c -m 644 -d $(htmldocs_DATA) $(DESTDIR)$(htmldocsdir)
 
 # Modify the install hook, so we can install directories
 install-htmldocsDATA:
-	mkdir -p $(htmldocsdir)
-	cp -r ./html $(htmldocsdir)/
+	mkdir -p $(DESTDIR)$(htmldocsdir)
+	cp -r ./html $(DESTDIR)$(htmldocsdir)/
 
Index: Makefile.in
===================================================================
--- Makefile.in.orig
+++ Makefile.in
@@ -93,8 +90,8 @@ am__nobase_list = $(am__nobase_strip_set
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(docsdir)" "$(DESTDIR)$(pkgconfigdir)"
-DATA = $(docs_DATA) $(pkgconfig_DATA)
+am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)"
+DATA = $(doc_DATA) $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -268,8 +265,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src include
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = frei0r.pc
-docsdir = ${prefix}/share/doc/${PACKAGE}
-docs_DATA = README ChangeLog TODO AUTHORS 
+doc_DATA = README ChangeLog TODO AUTHORS COPYING
 all: all-recursive
 
 .SUFFIXES:
@@ -318,26 +314,26 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
-install-docsDATA: $(docs_DATA)
+install-docDATA: $(doc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docsdir)" || $(MKDIR_P) "$(DESTDIR)$(docsdir)"
-	@list='$(docs_DATA)'; test -n "$(docsdir)" || list=; \
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docsdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
 	done
 
-uninstall-docsDATA:
+uninstall-docDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(docs_DATA)'; test -n "$(docsdir)" || list=; \
+	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(docsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(docsdir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(docdir)" && rm -f $$files
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@@ -673,7 +670,7 @@ check: check-recursive
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(docsdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
+	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -723,7 +720,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-docsDATA install-pkgconfigDATA
+install-data-am: install-docDATA install-pkgconfigDATA
 
 install-dvi: install-dvi-recursive
 
@@ -769,7 +766,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-docsDATA uninstall-pkgconfigDATA
+uninstall-am: uninstall-docDATA uninstall-pkgconfigDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 	install-am install-strip tags-recursive
@@ -781,7 +778,7 @@ uninstall-am: uninstall-docsDATA uninsta
 	distcheck distclean distclean-generic distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-docsDATA install-dvi \
+	install-data install-data-am install-docDATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
@@ -789,7 +786,7 @@ uninstall-am: uninstall-docsDATA uninsta
 	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-docsDATA \
+	uninstall uninstall-am uninstall-docDATA \
 	uninstall-pkgconfigDATA
 
 
Index: doc/Makefile.in
===================================================================
--- doc/Makefile.in.orig
+++ doc/Makefile.in
@@ -209,7 +206,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 htmldocs_DATA = html
-htmldocsdir = ${prefix}/share/doc/${PACKAGE}
+htmldocsdir = ${docdir}
 all: all-am
 
 .SUFFIXES:
@@ -416,12 +413,12 @@ dist-hook:
 	-cp -ra html $(distdir)/doc/
 
 install-data:
-	install -c -m 644 -d $(htmldocs_DATA) $(htmldocsdir)
+	install -c -m 644 -d $(htmldocs_DATA) $(DESTDIR)$(htmldocsdir)
 
 # Modify the install hook, so we can install directories
 install-htmldocsDATA:
-	mkdir -p $(htmldocsdir)
-	cp -r ./html $(htmldocsdir)/
+	mkdir -p $(DESTDIR)$(htmldocsdir)
+	cp -r ./html $(DESTDIR)$(htmldocsdir)/
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.