From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 11 May 2015 15:24:55 +0000 (+0000)
Subject: tools: replace private DOCDIR with automake docdir
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3195
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=057e61fba127ccaf4cb157aa7958437abfaff78e;p=xen.git

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 6db108a2d5..ddd72dfb6f 100644
--- 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 94965c7f2e..60bc54100a 100644
--- 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 3e01aa688a..faa7c21476 100644
--- 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 a676d3236d..5095682581 100644
--- 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: