diff -Nuar Thunar-1.0.1-old/docs/Makefile.am Thunar-1.0.1/docs/Makefile.am
--- Thunar-1.0.1-old/docs/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/Makefile.am	2009-12-07 19:32:38.000000000 +0100
@@ -6,7 +6,7 @@
 	papers								\
 	reference
 
-docdir = $(datadir)/doc/Thunar
+docdir = @docdir@
 doc_DATA =								\
 	README.gtkrc							\
 	README.thunarrc							\
diff -Nuar Thunar-1.0.1-old/docs/manual/C/images/Makefile.am Thunar-1.0.1/docs/manual/C/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/C/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/C/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 24510 2007-01-16 19:16:27Z benny $
 
-imagesdir = $(datadir)/doc/Thunar/html/C/images
+imagesdir = @docdir@/html/C/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/C/Makefile.am Thunar-1.0.1/docs/manual/C/Makefile.am
--- Thunar-1.0.1-old/docs/manual/C/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/C/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/C
+TARGET_DIR = @docdir@/html/C
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/da/images/Makefile.am Thunar-1.0.1/docs/manual/da/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/da/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/da/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,4 +1,4 @@
-imagesdir = $(datadir)/doc/Thunar/html/da/images
+imagesdir = @docdir@/html/da/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png					\
diff -Nuar Thunar-1.0.1-old/docs/manual/da/Makefile.am Thunar-1.0.1/docs/manual/da/Makefile.am
--- Thunar-1.0.1-old/docs/manual/da/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/da/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,7 +1,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/da
+TARGET_DIR = @docdir@/html/da
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/es/images/Makefile.am Thunar-1.0.1/docs/manual/es/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/es/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/es/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 24510 2007-01-16 19:16:27Z benny $
 
-imagesdir = $(datadir)/doc/Thunar/html/es/images
+imagesdir = @docdir@/html/es/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/es/Makefile.am Thunar-1.0.1/docs/manual/es/Makefile.am
--- Thunar-1.0.1-old/docs/manual/es/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/es/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/es
+TARGET_DIR = @docdir@/html/es
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/eu/images/Makefile.am Thunar-1.0.1/docs/manual/eu/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/eu/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/eu/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 24510 2007-01-16 19:16:27Z benny $
 
-imagesdir = $(datadir)/doc/Thunar/html/eu/images
+imagesdir = @docdir@/html/eu/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/eu/Makefile.am Thunar-1.0.1/docs/manual/eu/Makefile.am
--- Thunar-1.0.1-old/docs/manual/eu/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/eu/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/eu
+TARGET_DIR = @docdir@/html/eu
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/fr/images/Makefile.am Thunar-1.0.1/docs/manual/fr/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/fr/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/fr/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 24510 2007-01-16 19:16:27Z benny $
 
-imagesdir = $(datadir)/doc/Thunar/html/fr/images
+imagesdir = @docdir@/html/fr/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/fr/Makefile.am Thunar-1.0.1/docs/manual/fr/Makefile.am
--- Thunar-1.0.1-old/docs/manual/fr/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/fr/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/fr
+TARGET_DIR = @docdir@/html/fr
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/gl/images/Makefile.am Thunar-1.0.1/docs/manual/gl/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/gl/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/gl/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id$
 
-imagesdir = $(datadir)/doc/Thunar/html/C/images
+imagesdir = @docdir@/html/C/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/gl/Makefile.am Thunar-1.0.1/docs/manual/gl/Makefile.am
--- Thunar-1.0.1-old/docs/manual/gl/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/gl/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/gl
+TARGET_DIR = @docdir@/html/gl
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/it/images/Makefile.am Thunar-1.0.1/docs/manual/it/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/it/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/it/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,4 +1,4 @@
-imagesdir = $(datadir)/doc/Thunar/html/it/images
+imagesdir = @docdir@/html/it/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/it/Makefile.am Thunar-1.0.1/docs/manual/it/Makefile.am
--- Thunar-1.0.1-old/docs/manual/it/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/it/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,7 +1,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/it
+TARGET_DIR = @docdir@/html/it
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/ja/images/Makefile.am Thunar-1.0.1/docs/manual/ja/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/ja/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/ja/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 24510 2007-01-16 19:16:27Z benny $
 
-imagesdir = $(datadir)/doc/Thunar/html/ja/images
+imagesdir = @docdir@/html/ja/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/ja/Makefile.am Thunar-1.0.1/docs/manual/ja/Makefile.am
--- Thunar-1.0.1-old/docs/manual/ja/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/ja/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/ja
+TARGET_DIR = @docdir@/html/ja
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/Makefile.am Thunar-1.0.1/docs/manual/Makefile.am
--- Thunar-1.0.1-old/docs/manual/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -13,7 +13,7 @@
 	tr								\
 	zh_TW
 
-cssdir = $(datadir)/doc/Thunar/html
+cssdir = @docdir@/html
 css_DATA =							\
 	thunar.css
 
diff -Nuar Thunar-1.0.1-old/docs/manual/nl/images/Makefile.am Thunar-1.0.1/docs/manual/nl/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/nl/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/nl/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 25433 2007-04-07 21:37:16Z maximilian $
 
-imagesdir = $(datadir)/doc/Thunar/html/nl/images
+imagesdir = @docdir@/html/nl/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/nl/Makefile.am Thunar-1.0.1/docs/manual/nl/Makefile.am
--- Thunar-1.0.1-old/docs/manual/nl/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/nl/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/nl
+TARGET_DIR = @docdir@/html/nl
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/pl/images/Makefile.am Thunar-1.0.1/docs/manual/pl/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/pl/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/pl/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 24614 2007-01-20 10:43:23Z benny $
 
-imagesdir = $(datadir)/doc/Thunar/html/pl/images
+imagesdir = @docdir@/html/pl/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/pl/Makefile.am Thunar-1.0.1/docs/manual/pl/Makefile.am
--- Thunar-1.0.1-old/docs/manual/pl/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/pl/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/pl
+TARGET_DIR = @docdir@/html/pl
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/ru/images/Makefile.am Thunar-1.0.1/docs/manual/ru/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/ru/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/ru/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 24510 2007-01-16 19:16:27Z benny $
 
-imagesdir = $(datadir)/doc/Thunar/html/ru/images
+imagesdir = @docdir@/html/ru/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/ru/Makefile.am Thunar-1.0.1/docs/manual/ru/Makefile.am
--- Thunar-1.0.1-old/docs/manual/ru/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/ru/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/ru
+TARGET_DIR = @docdir@/html/ru
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/tr/images/Makefile.am Thunar-1.0.1/docs/manual/tr/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/tr/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/tr/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,4 +1,4 @@
-imagesdir = $(datadir)/doc/Thunar/html/tr/images
+imagesdir = @docdir@/html/tr/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/tr/Makefile.am Thunar-1.0.1/docs/manual/tr/Makefile.am
--- Thunar-1.0.1-old/docs/manual/tr/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/tr/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,7 +1,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/tr
+TARGET_DIR = @docdir@/html/tr
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml
 
diff -Nuar Thunar-1.0.1-old/docs/manual/zh_TW/images/Makefile.am Thunar-1.0.1/docs/manual/zh_TW/images/Makefile.am
--- Thunar-1.0.1-old/docs/manual/zh_TW/images/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/zh_TW/images/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 24510 2007-01-16 19:16:27Z benny $
 
-imagesdir = $(datadir)/doc/Thunar/html/zh_TW/images
+imagesdir = @docdir@/html/zh_TW/images
 images_DATA =								\
 	bulk-rename.png							\
 	file-manager-window.png						\
diff -Nuar Thunar-1.0.1-old/docs/manual/zh_TW/Makefile.am Thunar-1.0.1/docs/manual/zh_TW/Makefile.am
--- Thunar-1.0.1-old/docs/manual/zh_TW/Makefile.am	2009-12-07 19:30:24.000000000 +0100
+++ Thunar-1.0.1/docs/manual/zh_TW/Makefile.am	2009-12-07 19:33:36.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS =								\
 	images
 
-TARGET_DIR = $(datadir)/doc/Thunar/html/zh_TW
+TARGET_DIR = @docdir@/html/zh_TW
 STYLESHEET = ../thunar.xsl
 DOCUMENT = Thunar.xml