mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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>
This commit is contained in:
parent
e14421b9aa
commit
7b8cf0cf29
|
@ -27,8 +27,8 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
|
|||
prefix?=$(HOME)
|
||||
bindir?=$(prefix)/bin
|
||||
mandir?=$(prefix)/man
|
||||
man1=$(mandir)/man1
|
||||
man7=$(mandir)/man7
|
||||
man1dir=$(mandir)/man1
|
||||
man7dir=$(mandir)/man7
|
||||
# DESTDIR=
|
||||
|
||||
INSTALL?=install
|
||||
|
@ -52,9 +52,9 @@ man1: $(DOC_MAN1)
|
|||
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)
|
||||
|
||||
|
||||
#
|
||||
|
|
4
Makefile
4
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=./ \
|
||||
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
|
||||
|
|
|
@ -3,7 +3,7 @@ all: git-svn
|
|||
prefix?=$(HOME)
|
||||
bindir?=$(prefix)/bin
|
||||
mandir?=$(prefix)/man
|
||||
man1=$(mandir)/man1
|
||||
man1dir=$(mandir)/man1
|
||||
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.1 $(DESTDIR)$(man1)
|
||||
$(INSTALL) git-svn.1 $(DESTDIR)$(man1dir)
|
||||
|
||||
doc: git-svn.1
|
||||
git-svn.1 : git-svn.xml
|
||||
|
|
Loading…
Reference in a new issue