From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Johannes Sixt <j6t@kdbg.org>, Steffen Prohaska <prohaska@zib.de>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] fix the installation path for html documentation
Date: Tue, 10 Feb 2009 16:14:13 +0100 [thread overview]
Message-ID: <1234278853-25452-1-git-send-email-git@drmicha.warpmail.net> (raw)
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@drmicha.warpmail.net>
---
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
next reply other threads:[~2009-02-10 15:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-10 15:14 Michael J Gruber [this message]
2009-02-10 20:25 ` [PATCH] fix the installation path for html documentation Johannes Sixt
2009-02-11 18:39 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1234278853-25452-1-git-send-email-git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=prohaska@zib.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).