undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pb/configure'

Browse Source 
* pb/configure:
  Rename man1 and man7 variables to man1dir and man7dir
  Allow INSTALL, bindir, mandir to be set in main Makefile
This commit is contained in:
Junio C Hamano 2006-07-26 13:35:35 -07:00
commit 24cf6e5847
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/Makefile
View File

@ -25,10 +25,10 @@ DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
prefix?=$(HOME) prefix?=$(HOME)
bin=$(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
@ -53,9 +53,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)
# #

6
Makefile
View File

@ -116,6 +116,8 @@ template_dir = $(prefix)/share/git-core/templates/
GIT_PYTHON_DIR = $(prefix)/share/git-core/python GIT_PYTHON_DIR = $(prefix)/share/git-core/python
# DESTDIR= # DESTDIR=
export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
CC = gcc CC = gcc
AR = ar AR = ar
TAR = tar TAR = tar
@ -753,8 +755,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/emacs/Makefile
View File

@ -3,9 +3,9 @@
EMACS = emacs EMACS = emacs
ELC = git.elc vc-git.elc ELC = git.elc vc-git.elc
INSTALL = install INSTALL ?= install
INSTALL_ELC = $(INSTALL) -m 644 INSTALL_ELC = $(INSTALL) -m 644
prefix = $(HOME) prefix ?= $(HOME)
emacsdir = $(prefix)/share/emacs/site-lisp emacsdir = $(prefix)/share/emacs/site-lisp
all: $(ELC) all: $(ELC)