Rename man1 and man7 variables to man1dir and man7dir

This patch renames man1 and man7 variables to man1dir and man7dir,
according to "Makefile Conventions: Variables for Installation
Directories" in make.info of GNU Make.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index ca6b77df286fa724a6fe93f07f2833288bc68f84..cc83610588c24e2da863449facd656fb8c07907f 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -27,8 +27,8 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
 prefix?=$(HOME)
 bindir?=$(prefix)/bin
 mandir?=$(prefix)/man
 prefix?=$(HOME)
 bindir?=$(prefix)/bin
 mandir?=$(prefix)/man

-man1=$(mandir)/man1
-man7=$(mandir)/man7
+man1dir=$(mandir)/man1
+man7dir=$(mandir)/man7

 # DESTDIR=
 
 INSTALL?=install
 # DESTDIR=
 
 INSTALL?=install


@@ -52,9 +52,9 @@ man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 
 install: man
 man7: $(DOC_MAN7)
 
 install: man

-       $(INSTALL) -d -m755 $(DESTDIR)$(man1) $(DESTDIR)$(man7)
-       $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1)
-       $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7)
+       $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)
+       $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir)
+       $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir)

 
 
 #
 
 
 #

diff --git a/Makefile b/Makefile
index b8fe669720462e395c434f7167389f29824a1504..ccd7c62e5760ec140b5860b30fd557ec3900fa3e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -714,8 +714,8 @@ dist-doc:
        rm -fr .doc-tmp-dir
        mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7
        $(MAKE) -C Documentation DESTDIR=./ \
        rm -fr .doc-tmp-dir
        mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7
        $(MAKE) -C Documentation DESTDIR=./ \

-               man1=../.doc-tmp-dir/man1 \
-               man7=../.doc-tmp-dir/man7 \
+               man1dir=../.doc-tmp-dir/man1 \
+               man7dir=../.doc-tmp-dir/man7 \

                install
        cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
        gzip -n -9 -f $(manpages).tar
                install
        cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
        gzip -n -9 -f $(manpages).tar

diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile
index 1a6585eeec1551ecd0557829d7603de4d87760b6..8cac68873b4266fc96c4a8ede418b44d393cf215 100644 (file)
--- a/contrib/git-svn/Makefile
+++ b/contrib/git-svn/Makefile
@@ -3,7 +3,7 @@ all: git-svn
 prefix?=$(HOME)
 bindir?=$(prefix)/bin
 mandir?=$(prefix)/man
 prefix?=$(HOME)
 bindir?=$(prefix)/bin
 mandir?=$(prefix)/man

-man1=$(mandir)/man1
+man1dir=$(mandir)/man1

 INSTALL?=install
 doc_conf=../../Documentation/asciidoc.conf
 -include ../../config.mak
 INSTALL?=install
 doc_conf=../../Documentation/asciidoc.conf
 -include ../../config.mak


@@ -17,7 +17,7 @@ install: all
        $(INSTALL) git-svn $(DESTDIR)$(bindir)
 
 install-doc: doc
        $(INSTALL) git-svn $(DESTDIR)$(bindir)
 
 install-doc: doc

-       $(INSTALL) git-svn.1 $(DESTDIR)$(man1)
+       $(INSTALL) git-svn.1 $(DESTDIR)$(man1dir)

 
 doc: git-svn.1
 git-svn.1 : git-svn.xml
 
 doc: git-svn.1
 git-svn.1 : git-svn.xml