summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-26 20:35:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-26 20:35:35 (GMT)
commit24cf6e5847073d50390e0b7950e8e6b5a09103bc (patch)
treea3210464e0996746deb4ec381bd8553753cb2ea2 /Documentation/Makefile
parent2c3cff49301c44767c72391cb5288aa0d10563a9 (diff)
parent7b8cf0cf2973cc8df3bdd36b9b36542b1f04d70a (diff)
downloadgit-24cf6e5847073d50390e0b7950e8e6b5a09103bc.zip
git-24cf6e5847073d50390e0b7950e8e6b5a09103bc.tar.gz
git-24cf6e5847073d50390e0b7950e8e6b5a09103bc.tar.bz2
Merge branch 'pb/configure'
* pb/configure: Rename man1 and man7 variables to man1dir and man7dir Allow INSTALL, bindir, mandir to be set in main Makefile
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 6dbe45b..0d9ffb4 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -25,10 +25,10 @@ DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
prefix?=$(HOME)
-bin=$(prefix)/bin
-mandir=$(prefix)/man
-man1=$(mandir)/man1
-man7=$(mandir)/man7
+bindir?=$(prefix)/bin
+mandir?=$(prefix)/man
+man1dir=$(mandir)/man1
+man7dir=$(mandir)/man7
# DESTDIR=
INSTALL?=install
@@ -53,9 +53,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)
#