>From 2a8c867e4ffafe473539ed4531ae44fa10b145c3 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <address@hidden>
Date: Thu, 29 Sep 2011 17:58:50 +0200
Subject: [PATCH 2/2] install html documentation in ${htmldir}

---
 doc/Makefile.am   |    2 +-
 src/Makefile.am   |    2 +-
 src/player_qt.cpp |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3baf581..a9959a8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -50,6 +50,6 @@ bino_TEXINFOS = bino.texi $(IMAGES)
 
 AM_MAKEINFOHTMLFLAGS = --no-split
 
-dist_doc_DATA = bino.html $(IMAGES)
+dist_html_DATA = bino.html $(IMAGES)
 
 EXTRA_DIST = $(man_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
index f67cdb8..90c0493 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -110,7 +110,7 @@ BUILT_SOURCES = $(nodist_bino_SOURCES)
 
 CLEANFILES = $(BUILT_SOURCES)
 
-DEFS += -DDOCDIR=\"$(docdir)\" -DLOCALEDIR=\"$(localedir)\"
+DEFS += -DHTMLDIR=\"$(htmldir)\" -DLOCALEDIR=\"$(localedir)\"
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/base \
 	$(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
diff --git a/src/player_qt.cpp b/src/player_qt.cpp
index fd108fc..cf5ccf6 100644
--- a/src/player_qt.cpp
+++ b/src/player_qt.cpp
@@ -2829,7 +2829,7 @@ void main_window::help_manual()
 #elif defined(Q_OS_MAC)
     manual_url = QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + "/../Resources/Bino Help/bino.html");
 #else
-    manual_url = QUrl::fromLocalFile(DOCDIR "/bino.html");
+    manual_url = QUrl::fromLocalFile(HTMLDIR "/bino.html");
 #endif
     if (!QDesktopServices::openUrl(manual_url))
     {
-- 
1.7.6.3