diff options
| author | Christopher Wilson <cwilson@cdwilson.us> | 2010-09-21 00:25:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-27 10:47:04 -0700 |
| commit | 7ce896b3000a7bd2ea24f02ad3051f43ad351e1f (patch) | |
| tree | a9836b042514967c5a5ca14addc75f010ae4c911 /gitweb/Makefile | |
| parent | 9027fa9eb7df606b6658dd48a40bb993ce222ddd (diff) | |
| download | git-7ce896b3000a7bd2ea24f02ad3051f43ad351e1f.tar.gz git-7ce896b3000a7bd2ea24f02ad3051f43ad351e1f.tar.xz | |
Enable highlight executable path as a configuration option
Allow build-time/run-time configuration of the highlight executable
(must be the one from http://www.andre-simon.de due to assumptions
about parameters and output). Defaults to previous behavior which
assumes that highlight is available on the server PATH. However, if
this is not the case, the path to the highlight executable can be
configured at build time as a configuration variable
HIGHLIGHT_BIN = /path/to/highlight
or at runtime by configuring GITWEB_CONFIG
$highlight_bin = /path/to/highlight
Signed-off-by: Christopher Wilson <cwilson@cdwilson.us>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 2fb7c2d77..e32ee7630 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 $@+ |