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 /contrib | |
| 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 'contrib')
| -rw-r--r-- | contrib/emacs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile index d3619db51..350846de9 100644 --- a/contrib/emacs/Makefile +++ b/contrib/emacs/Makefile @@ -3,9 +3,9 @@ EMACS = emacs ELC = git.elc vc-git.elc -INSTALL = install +INSTALL ?= install INSTALL_ELC = $(INSTALL) -m 644 -prefix = $(HOME) +prefix ?= $(HOME) emacsdir = $(prefix)/share/emacs/site-lisp all: $(ELC) |