diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-26 13:35:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-26 13:35:35 -0700 |
| commit | 24cf6e5847073d50390e0b7950e8e6b5a09103bc (patch) | |
| tree | a3210464e0996746deb4ec381bd8553753cb2ea2 /Makefile | |
| parent | 2c3cff49301c44767c72391cb5288aa0d10563a9 (diff) | |
| parent | 7b8cf0cf2973cc8df3bdd36b9b36542b1f04d70a (diff) | |
| download | git-24cf6e5847073d50390e0b7950e8e6b5a09103bc.tar.gz git-24cf6e5847073d50390e0b7950e8e6b5a09103bc.tar.xz | |
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 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -116,6 +116,8 @@ template_dir = $(prefix)/share/git-core/templates/ GIT_PYTHON_DIR = $(prefix)/share/git-core/python # DESTDIR= +export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR + CC = gcc AR = ar TAR = tar @@ -753,8 +755,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 |