summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schaal <farbing@web.de>2011-10-01 08:58:50 +0200
committerMartin Lambers <marlam@marlam.de>2011-10-01 08:58:50 +0200
commit39a9cca31187ef1c4a6a0869dd9ae4079095d154 (patch)
treeed585ca4f8882b96c1ba1aec748ca113997a0928
parentb66c0e952bc85550eeccdbd8ad170c0444817c82 (diff)
downloadbino-39a9cca31187ef1c4a6a0869dd9ae4079095d154.tar.gz
Install html documentation in ${htmldir}.
-rw-r--r--doc/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/player_qt.cpp2
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))
{