diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-24 09:43:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-24 09:43:28 (GMT) |
| commit | cc58fc0684396c5298b21c97f00a568e46224258 (patch) | |
| tree | eae57897af7ed7fab38e3ce34328ef4f274fa25e /Makefile | |
| parent | 8a13becc0dd4c8876ebf471bf880446c1a10b7e9 (diff) | |
| parent | 8565d2d853d85f246faa9bcde91aba3415a24d54 (diff) | |
| download | git-cc58fc0684396c5298b21c97f00a568e46224258.zip git-cc58fc0684396c5298b21c97f00a568e46224258.tar.gz git-cc58fc0684396c5298b21c97f00a568e46224258.tar.bz2 | |
Merge branch 'js/etc-config'
* js/etc-config:
Make tests independent of global config files
config: read system-wide defaults from /etc/gitconfig
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -128,6 +128,7 @@ prefix = $(HOME) bindir = $(prefix)/bin gitexecdir = $(bindir) template_dir = $(prefix)/share/git-core/templates/ +ETC_GITCONFIG = $(prefix)/etc/gitconfig # DESTDIR= # default configuration for gitweb @@ -598,6 +599,7 @@ endif # Shell quote (do not use $(call) to accommodate ancient setups); SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER)) +ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC_GITCONFIG)) DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) bindir_SQ = $(subst ','\'',$(bindir)) @@ -610,7 +612,8 @@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) LIBS = $(GITLIBS) $(EXTLIBS) -BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS) +BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \ + -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS) LIB_OBJS += $(COMPAT_OBJS) ALL_CFLAGS += $(BASIC_CFLAGS) |