tools: replace private DOCDIR with automake docdir

Reuse automake variable instead of inventing a private variable.

The result of this command:
 git grep -wnl DOCDIR | xargs sed -i 's@DOCDIR@docdir@g'

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 6db108a2d54d66a10509cef956e5d3d921c33f70..ddd72dfb6f7ed4398cd4df8d767211b3f4d6897c 100644 (file)
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -37,7 +37,6 @@ LIBEXEC_INC              := $(LIBEXEC)/include
 SHAREDIR                 := @SHAREDIR@
 MAN1DIR                  := $(mandir)/man1
 MAN8DIR                  := $(mandir)/man8
-DOCDIR                   := $(docdir)
 
 XEN_RUN_DIR              := @XEN_RUN_DIR@
 XEN_LOG_DIR              := @XEN_LOG_DIR@

diff --git a/docs/Makefile b/docs/Makefile
index 94965c7f2ec2e04893f922418f664816e88d41c9..60bc54100ace9375f55703770a8bdab75ab3168c 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -85,8 +85,8 @@ install-man-pages: man-pages
 
 .PHONY: install-html
 install-html: html txt figs
-       $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
-       [ ! -d html ] || cp -R html $(DESTDIR)$(DOCDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(docdir)
+       [ ! -d html ] || cp -R html $(DESTDIR)$(docdir)
 
 .PHONY: install
 install: install-man-pages install-html

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 3e01aa688a4fc01e391cd02af9fceaf3621b9d1d..faa7c214761d8920212422337b9e19dae8f5d6f4 100644 (file)
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -469,8 +469,8 @@ install: $(STUBDOMPATH)
 endif
 
 install-readme:
-       $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
-       $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.stubdom
+       $(INSTALL_DIR) $(DESTDIR)$(docdir)
+       $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.stubdom
 
 install-ioemu: ioemu-stubdom
        $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)"

diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index a676d3236dd740de627f834ecfecead819b03046..50956825816ed251fccd991426c36b56f8418acc 100644 (file)
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -31,8 +31,8 @@ install: build
        $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
        $(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(sbindir)/xentrace_setmask
        $(INSTALL_PROG) xenmon.py  $(DESTDIR)$(sbindir)/xenmon.py
-       $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
-       $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon
+       $(INSTALL_DIR) $(DESTDIR)$(docdir)
+       $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.xenmon
 
 .PHONY: clean
 clean: