Install HTML docs under $(docdir)/html

Signed-off-by: Mike Miller <mtmiller@ieee.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/www/Makefile.am b/www/Makefile.am
index 712da99..3f46a11 100644 (file)
--- a/www/Makefile.am
+++ b/www/Makefile.am
@@ -10,7 +10,8 @@ TOPLEVEL_PAGES = contribute.html mail.html technical.html
 
 ALL_PAGES = $(FTR_PAGES) $(START_PAGES) $(INDEX_PAGES) $(TOPLEVEL_PAGES)
 
-pkgdata_DATA = $(ALL_PAGES)
+htmldir = $(docdir)/html
+html_DATA = $(ALL_PAGES)
 
 .xml.html:
        $(PYTHON) $(CONV) -d $(srcdir) $< > $@ || (rm $@; exit 1)

diff --git a/www/images/Makefile.am b/www/images/Makefile.am
index 3494149..60fe9c7 100644 (file)
--- a/www/images/Makefile.am
+++ b/www/images/Makefile.am
@@ -1,3 +1,3 @@
-imagesdir = $(pkgdatadir)/images
+imagesdir = $(docdir)/html/images
 dist_images_DATA = $(srcdir)/*.png $(srcdir)/*.svg
 

diff --git a/www/inc/Makefile.am b/www/inc/Makefile.am
index 2da9b66..316c38b 100644 (file)
--- a/www/inc/Makefile.am
+++ b/www/inc/Makefile.am
@@ -1,3 +1,3 @@
-tmpldatadir = $(pkgdatadir)/inc
+tmpldatadir = $(docdir)/html/inc
 dist_tmpldata_DATA = $(srcdir)/*.tmpl
 

diff --git a/www/styles/Makefile.am b/www/styles/Makefile.am
index 3fa5214..a7a93d7 100644 (file)
--- a/www/styles/Makefile.am
+++ b/www/styles/Makefile.am
@@ -1,3 +1,3 @@
-stylesdatadir = $(pkgdatadir)/styles
+stylesdatadir = $(docdir)/html/styles
 dist_stylesdata_DATA = main.css