diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:33:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:33:34 -0700 |
| commit | 86bd7f99892238d36c62c18477ea360037ac19dc (patch) | |
| tree | 5ee8dc3d7a53e2110a8bffda01f51ff1b7e0246f /gitweb/Makefile | |
| parent | Merge branch 'jk/reset-reflog-message-fix' (diff) | |
| parent | gitweb: Introduce common system-wide settings for convenience (diff) | |
| download | git-86bd7f99892238d36c62c18477ea360037ac19dc.tar.gz git-86bd7f99892238d36c62c18477ea360037ac19dc.zip | |
Merge branch 'jn/gitweb-system-config'
* jn/gitweb-system-config:
gitweb: Introduce common system-wide settings for convenience
Diffstat (limited to 'gitweb/Makefile')
| -rw-r--r-- | gitweb/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile index 5d20515fba..1c85b5fda8 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -20,6 +20,7 @@ INSTALL ?= install # default configuration for gitweb GITWEB_CONFIG = gitweb_config.perl GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf +GITWEB_CONFIG_COMMON = /etc/gitweb-common.conf GITWEB_HOME_LINK_STR = projects GITWEB_SITENAME = GITWEB_PROJECTROOT = /pub/git @@ -129,6 +130,7 @@ GITWEB_REPLACE = \ -e 's|++GIT_BINDIR++|$(bindir)|g' \ -e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \ -e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \ + -e 's|++GITWEB_CONFIG_COMMON++|$(GITWEB_CONFIG_COMMON)|g' \ -e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \ -e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \ -e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \ |