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>
Jakub Narebski committed
Jun 29, 2006 at 23:26 UTC
7b8cf0cf2973cc8df3bdd36b9b36542b1f04d70a
3 files changed
+9
-9
Documentation/Makefile
+5
-5
@@ -27,8 +27,8 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
27
prefix?=$(HOME)
28
bindir?=$(prefix)/bin
29
mandir?=$(prefix)/man
30
-man1=$(mandir)/man1
31
-man7=$(mandir)/man7
30
+man1dir=$(mandir)/man1
31
+man7dir=$(mandir)/man7
32
# DESTDIR=
33
34
INSTALL?=install
@@ -52,9 +52,9 @@ man1: $(DOC_MAN1)
52
man7: $(DOC_MAN7)
53
54
install: man
55
- $(INSTALL) -d -m755 $(DESTDIR)$(man1) $(DESTDIR)$(man7)
56
- $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1)
57
- $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7)
55
+ $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)
56
+ $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir)
57
+ $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir)
58
59
60
#
Makefile
+2
-2
@@ -714,8 +714,8 @@ dist-doc:
714
rm -fr .doc-tmp-dir
715
mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7
716
$(MAKE) -C Documentation DESTDIR=./ \
717
- man1=../.doc-tmp-dir/man1 \
718
- man7=../.doc-tmp-dir/man7 \
717
+ man1dir=../.doc-tmp-dir/man1 \
718
+ man7dir=../.doc-tmp-dir/man7 \
719
install
720
cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
721
gzip -n -9 -f $(manpages).tar
contrib/git-svn/Makefile
+2
-2
@@ -3,7 +3,7 @@ all: git-svn
3
prefix?=$(HOME)
4
bindir?=$(prefix)/bin
5
mandir?=$(prefix)/man
6
-man1=$(mandir)/man1
6
+man1dir=$(mandir)/man1
7
INSTALL?=install
8
doc_conf=../../Documentation/asciidoc.conf
9
-include ../../config.mak
@@ -17,7 +17,7 @@ install: all
17
$(INSTALL) git-svn $(DESTDIR)$(bindir)
18
19
install-doc: doc
20
- $(INSTALL) git-svn.1 $(DESTDIR)$(man1)
20
+ $(INSTALL) git-svn.1 $(DESTDIR)$(man1dir)
21
22
doc: git-svn.1
23
git-svn.1 : git-svn.xml