[Nano-devel] [PATCH 1/3] use htmldir for html pages

[Mike Frysinger]

The build already provides a standard htmldir for installing html
files.  Use that instead of creating our own.
---
 doc/Makefile.am        | 2 +-
 doc/man/Makefile.am    | 3 +--
 doc/man/fr/Makefile.am | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 15f35ee..24f8095 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,4 +4,4 @@ else
 SUBDIRS = man texinfo
 endif
 
-EXTRA_DIST = faq.html
+dist_html_DATA = faq.html
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index fbcdce8..a04710c 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -18,8 +18,7 @@ endif
 
 nano_man_mans = nano.1 nanorc.5 rnano.1
 if GROFF_HTML
-htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
-htmlmandir = $(datadir)/nano/man-html
+dist_html_DATA = nano.1.html nanorc.5.html rnano.1.html
 nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am
index 7a43052..6ae8921 100644
--- a/doc/man/fr/Makefile.am
+++ b/doc/man/fr/Makefile.am
@@ -1,4 +1,5 @@
 mandir = @mandir@/fr
+htmldir = @htmldir@/fr
 
 if USE_NANORC
 man_MANS = nano.1 nanorc.5 rnano.1
@@ -14,8 +15,7 @@ endif
 
 nano_man_mans = nano.1 nanorc.5 rnano.1
 if GROFF_HTML
-htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
-htmlmandir = $(datadir)/nano/man-html/fr
+html_DATA = nano.1.html nanorc.5.html rnano.1.html
 
 nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
-- 
1.9.1