[Xen-changelog] [xen master] tools: replace private MANDIR with automake mandir

[patchbot@xxxxxxx]

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

    tools: replace private MANDIR with automake mandir
    
    Reuse automake variable instead of inventing a private variable.
    
    The result of this command:
     git grep -wnl MANDIR | xargs sed -i 's@MANDIR@mandir@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>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 config/Paths.mk.in |    5 ++---
 docs/Makefile      |    6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 32f7c78..8ca02bb 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -35,9 +35,8 @@ LIBEXEC_LIB              := $(LIBEXEC)/lib
 LIBEXEC_INC              := $(LIBEXEC)/include
 
 SHAREDIR                 := @SHAREDIR@
-MANDIR                   := $(mandir)
-MAN1DIR                  := $(MANDIR)/man1
-MAN8DIR                  := $(MANDIR)/man8
+MAN1DIR                  := $(mandir)/man1
+MAN8DIR                  := $(mandir)/man8
 LIBDIR                   := $(libdir)
 DOCDIR                   := $(docdir)
 
diff --git a/docs/Makefile b/docs/Makefile
index 9183252..94965c7 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -79,9 +79,9 @@ distclean: clean
 # Top level install targets
 .PHONY: install-man-pages
 install-man-pages: man-pages
-       $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
-       cp -R man1 $(DESTDIR)$(MANDIR)
-       cp -R man5 $(DESTDIR)$(MANDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(mandir)
+       cp -R man1 $(DESTDIR)$(mandir)
+       cp -R man5 $(DESTDIR)$(mandir)
 
 .PHONY: install-html
 install-html: html txt figs
--
generated by git-patchbot for /home/xen/git/xen.git#master

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