diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-24 22:07:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 22:07:34 -0700 |
| commit | b01c7c0ee3b692055c6026a9e22380d6ad35811b (patch) | |
| tree | 9c5ee7df4b0dc26dbd0fb202f159285e714bb5bd /Makefile | |
| parent | 61397d4b8da2f2ab3fd767c6058ad05ca10269b8 (diff) | |
| parent | ce11873921e19be44082660882e07b205082643b (diff) | |
| download | git-b01c7c0ee3b692055c6026a9e22380d6ad35811b.tar.gz | |
Merge branch 'maint'
* maint:
Remove usernames from all commit messages, not just when using svmprops
applymbox & quiltimport: typofix.
Create a sysconfdir variable, and use it for ETC_GITCONFIG
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -141,7 +141,12 @@ prefix = $(HOME) bindir = $(prefix)/bin gitexecdir = $(bindir) template_dir = $(prefix)/share/git-core/templates/ -ETC_GITCONFIG = $(prefix)/etc/gitconfig +ifeq ($(prefix),/usr) +sysconfdir = /etc +else +sysconfdir = $(prefix)/etc +endif +ETC_GITCONFIG = $(sysconfdir)/gitconfig # DESTDIR= # default configuration for gitweb @@ -160,7 +165,7 @@ GITWEB_FAVICON = git-favicon.png GITWEB_SITE_HEADER = GITWEB_SITE_FOOTER = -export prefix bindir gitexecdir template_dir +export prefix bindir gitexecdir template_dir sysconfdir CC = gcc AR = ar |