[Xen-changelog] [xen master] tools: replace private DOCDIR with automake docdir

[patchbot@xxxxxxx]

commit 057e61fba127ccaf4cb157aa7958437abfaff78e
Author:     Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Mon May 11 15:24:55 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu May 21 15:12:11 2015 +0100

    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@xxxxxxxxx>
    Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
    Cc: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 config/Paths.mk.in    |    1 -
 docs/Makefile         |    4 ++--
 stubdom/Makefile      |    4 ++--
 tools/xenmon/Makefile |    4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 6db108a..ddd72df 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 94965c7..60bc541 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 3e01aa6..faa7c21 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 a676d32..5095682 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:
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog