diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-06 12:10:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 12:10:58 -0700 |
| commit | 314ae0f421511137580ff6707643ccb75b2d2b34 (patch) | |
| tree | 94d2ff6450229871a71716750bedb4f80ad11fec /gitweb/Makefile | |
| parent | ee79b21778cb6b20451f2357ede33f3f5760338c (diff) | |
| parent | 7ce896b3000a7bd2ea24f02ad3051f43ad351e1f (diff) | |
| download | git-314ae0f421511137580ff6707643ccb75b2d2b34.tar.xz | |
Merge branch 'cw/gitweb-hilite-config'
* cw/gitweb-hilite-config:
Enable highlight executable path as a configuration option
Diffstat (limited to 'gitweb/Makefile')
| -rw-r--r-- | gitweb/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile index 2fb7c2d77b..e32ee76309 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -35,6 +35,7 @@ GITWEB_FAVICON = static/git-favicon.png GITWEB_JS = static/gitweb.js GITWEB_SITE_HEADER = GITWEB_SITE_FOOTER = +HIGHLIGHT_BIN = highlight # include user config -include ../config.mak.autogen @@ -129,7 +130,8 @@ GITWEB_REPLACE = \ -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \ -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \ -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \ - -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' + -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \ + -e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|g' GITWEB-BUILD-OPTIONS: FORCE @rm -f $@+ |