kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jakub Narebski 2006-06-29 23:26:54 +02:00 committed by Junio C Hamano
parent e14421b9aa
commit 7b8cf0cf29
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/Makefile
View File

@ -27,8 +27,8 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
prefix?=$(HOME) prefix?=$(HOME)
bindir?=$(prefix)/bin bindir?=$(prefix)/bin
mandir?=$(prefix)/man mandir?=$(prefix)/man
man1=$(mandir)/man1 man1dir=$(mandir)/man1
man7=$(mandir)/man7 man7dir=$(mandir)/man7
# DESTDIR= # DESTDIR=


INSTALL?=install INSTALL?=install
@ -52,9 +52,9 @@ man1: $(DOC_MAN1)
man7: $(DOC_MAN7) man7: $(DOC_MAN7)


install: man install: man
$(INSTALL) -d -m755 $(DESTDIR)$(man1) $(DESTDIR)$(man7) $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)
$(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1) $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir)
$(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7) $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir)




# #

4
Makefile
View File

@ -714,8 +714,8 @@ dist-doc:
rm -fr .doc-tmp-dir rm -fr .doc-tmp-dir
mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7 mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7
$(MAKE) -C Documentation DESTDIR=./ \ $(MAKE) -C Documentation DESTDIR=./ \
man1=../.doc-tmp-dir/man1 \ man1dir=../.doc-tmp-dir/man1 \
man7=../.doc-tmp-dir/man7 \ man7dir=../.doc-tmp-dir/man7 \
install install
cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar . cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
gzip -n -9 -f $(manpages).tar gzip -n -9 -f $(manpages).tar

4
contrib/git-svn/Makefile
View File

@ -3,7 +3,7 @@ all: git-svn
prefix?=$(HOME) prefix?=$(HOME)
bindir?=$(prefix)/bin bindir?=$(prefix)/bin
mandir?=$(prefix)/man mandir?=$(prefix)/man
man1=$(mandir)/man1 man1dir=$(mandir)/man1
INSTALL?=install INSTALL?=install
doc_conf=../../Documentation/asciidoc.conf doc_conf=../../Documentation/asciidoc.conf
-include ../../config.mak -include ../../config.mak
@ -17,7 +17,7 @@ install: all
$(INSTALL) git-svn $(DESTDIR)$(bindir) $(INSTALL) git-svn $(DESTDIR)$(bindir)


install-doc: doc install-doc: doc
$(INSTALL) git-svn.1 $(DESTDIR)$(man1) $(INSTALL) git-svn.1 $(DESTDIR)$(man1dir)


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