--- html/Makefile.am	2012-07-10 19:54:41.844906721 +0200
+++ html/Makefile.am	2012-07-10 19:54:47.885831199 +0200
@@ -1,13 +1,13 @@
 
-HelpHtmlrootdir = $(datadir)/doc/httrack
-HelpHtmldir = $(datadir)/doc/httrack/html
-HelpHtmlimgdir = $(datadir)/doc/httrack/html/img
-HelpHtmldivdir = $(datadir)/doc/httrack/html/div
-HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images
-HelpHtmlTxtdir = $(datadir)/doc/httrack/html
-WebHtmldir = $(datadir)/doc/httrack/html/server
-WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
-WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
+HelpHtmlrootdir = $(docdir)
+HelpHtmldir = $(htmldir)
+HelpHtmlimgdir = $(HelpHtmldir)/img
+HelpHtmldivdir = $(HelpHtmldir)/div
+HelpHtmlimagesdir = $(HelpHtmldir)/images
+HelpHtmlTxtdir = $(HelpHtmldir)
+WebHtmldir = $(HelpHtmldir)/server
+WebHtmlimagesdir = $(HelpHtmldir)/server/images
+WebHtmlsfxdir = $(HelpHtmldir)/server/sfx
 WebPixmapdir = $(datadir)/pixmaps
 WebGPixmapdir = $(datadir)/httrack/icons
 VFolderEntrydir = $(prefix)/share/applications
@@ -36,8 +36,6 @@
 install-data-hook:
 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
 		( cd $(DESTDIR)$(prefix)/share/httrack \
-			&& mv -f ../doc/httrack/html html \
-			&& cd ../doc/httrack/ \
-			&& $(LN_S) ../../httrack/html html \
+			&& $(LN_S) $(htmldir) html \
 		) \
 	fi