Since 026fa0d5ad9538ca76838070861531c037d7b9ba (Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX) the installation of html doc was broken: Documentation/Makefile does not know how to resolve relative dirs, which results in html doc being installed in $(git-build-root)/Documentation/share/doc/git-doc. Fix this by not exporting htmldir from Makefile since this allows Documentation/Makefile to compute htmldir from prefix. Signed-off-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> --- An alternative would be to teach Documentation/Makefile to take the relative htmldir and make it into an absolute path. But the approach I'm taking with this patch as analogous to how mandir is handled, with the same draw back. But all is well as long as the build monkey messes with prefix only. Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 27b9569..862b96c 100644 --- a/Makefile +++ b/Makefile @@ -228,7 +228,7 @@ GITWEB_FAVICON = git-favicon.png GITWEB_SITE_HEADER = GITWEB_SITE_FOOTER = -export prefix bindir sharedir htmldir sysconfdir +export prefix bindir sharedir sysconfdir CC = gcc AR = ar -- 1.6.1.2.253.ga34a -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
