[beast: 23/41] BUILD: preserve $docdir while installing documentation in the Beast <package> dir

[Tim Janik <timj src gnome org>]

commit 520edcca56cdb8c411d2c54e900732c0f26f39e8
Author: Tim Janik <timj gnu org>
Date:   Wed Jun 14 16:29:50 2017 +0200

    BUILD: preserve $docdir while installing documentation in the Beast <package> dir
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.am      |    2 +-
 configure.ac     |    6 +++---
 docs/Makefile.am |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d1a3248..90b5c6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS         = . data sfi bse plugins drivers shell pybeast beast-gtk launchers libr
 noinst_DATA    =
 
 # == doc/ install ==
-projectdocsdir   = $(docdir)/
+projectdocsdir   = $(beastdocdir)/
 projectdocs_DATA = HACKING README NEWS COPYING
 EXTRA_DIST      += $(projectdocs_DATA)
 .SECONDARY: HACKING.md README.md               # pacify make(1) when shipping files generated from markdown
diff --git a/configure.ac b/configure.ac
index eec4277..29b47c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,7 @@ beastbindir="\${beastdir}/bin"
 bselibdir="\${beastdir}/lib"
 datarootdir="\${beastdir}/share"
 datadir="\${beastdir}"
-docdir="\${beastdir}/doc"
+beastdocdir="\${beastdir}/doc"
 bseincludedir="\${beastdir}/include"
 # Provide directories for C++ and move Beast packagedir into libdir if under /usr
 bak_prefix="$prefix"; bak_exec_prefix="$exec_prefix"
@@ -105,7 +105,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_LOCALEBASE, ["`eval echo ${localedir}`"
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_LADSPA, ["`eval echo ${libdir}/ladspa`"], [Searchpath for LADSPA 
plugins])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_BSELIBDIR, ["`eval echo ${bselibdir}`"], [Directory to install 
plugins and drivers])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_DATADIR, ["`eval echo ${datadir}`"], [Directory to install samples, 
effects, scripts, etc])
-AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_DOCDIR, ["`eval echo ${docdir}`"], [Directory to install 
documentation])
+AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_DOCDIR, ["`eval echo ${beastdocdir}`"], [Directory to install 
documentation])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_USER_DATA, ["~/beast"], [Searchpath for user owned Beast resources])
 bseincludedir="$bak_bseincludedir"; beastdir="$bak_beastdir"
 libdir="$bak_libdir"; datarootdir="$bak_datarootdir"; datadir="$bak_datadir"
@@ -114,7 +114,7 @@ prefix="$bak_prefix"; exec_prefix="$bak_exec_prefix"
 AC_SUBST(bseincludedir)
 AC_SUBST(beastbindir)
 AC_SUBST(bselibdir)
-AC_SUBST(docdir)
+AC_SUBST(beastdocdir)
 AC_SUBST(beastdir)
 
 # == Check for git ==
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2343ecc..ca873ce 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -108,7 +108,7 @@ doxy/html/doc-version: doxy/html $(man1_HTMLS) $(man5_HTMLS)
        $(Q) echo "$(PACKAGE)-$(topbuildid)" > $@
 
 # == install docs/doxy/html ==
-docs_html_installbase   = $(docdir)
+docs_html_installbase   = $(beastdocdir)
 noinst_DATA            += doxy/html/doc-version        # AM target to trigger docs/doxy/html builds
 docs-html-install: $(docs_html_install_DATA)
        rm -Rf "$(DESTDIR)$(docs_html_installbase)"/html/