From: Petr Baudis <pasky@suse.cz>
To: git@vger.kernel.org
Subject: [PATCH] Fix documentation installation
Date: Fri, 12 Aug 2005 23:11:45 +0200 [thread overview]
Message-ID: <20050812211145.GA20812@pasky.ji.cz> (raw)
Documentation's install target now depends on man since
it installs manpages. It now also installs the .txt files, to
$prefix/share/doc/cogito/txt/ by default. A separate install-html target
was added for installing .html files to $prefix/share/doc/cogito/html/. It
isn't part of the install target since building HTML might cause problems
on some asciidoc installations (like, well, mine) as xhtml11 appears
not to be an official asciidoc plugin, or so asciidoc claims.
The missing dependency was pointed out by Jonas Fonseca.
Signed-off-by: Petr Baudis <pasky@suse.cz>
---
commit e7b483b293fb7d359dcebf974e6784f8b14f2ab1
tree 5e998614a0dbce85758de5be847306837953bb42
parent 2b0289c3805d0c99eb031a7116948a3cb4ddf332
author Petr Baudis <pasky@suse.cz> Fri, 12 Aug 2005 22:58:13 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 12 Aug 2005 22:58:13 +0200
Documentation/Makefile | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -11,6 +11,9 @@ bin=$(prefix)/bin
mandir=$(prefix)/man
man1=$(mandir)/man1
man7=$(mandir)/man7
+docdir=$(prefix)/share/doc/git-core
+txtdir=$(docdir)/txt
+htmldir=$(docdir)/html
# DESTDIR=
INSTALL=install
@@ -33,11 +36,18 @@ man: man1 man7
man1: $(DOC_MAN1)
man7: $(DOC_MAN7)
-install:
+install: man
+ $(INSTALL) -m755 -d $(DESTDIR)/$(txtdir)
+ $(INSTALL) $(MAN1_TXT) $(MAN7_TXT) $(DESTDIR)/$(txtdir)
$(INSTALL) -m755 -d $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
+install-html: html
+ $(INSTALL) -m755 -d $(DESTDIR)/$(htmldir)
+ $(INSTALL) $(DOC_HTML) $(DESTDIR)/$(htmldir)
+
+
# 'include' dependencies
git-diff-%.txt: diff-format.txt diff-options.txt
touch $@
diff --git a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -18,7 +18,7 @@ git-%: %.c
all: $(PROGRAMS)
install: $(PROGRAMS) $(SCRIPTS)
- $(INSTALL) -m755 -d $(dest)$(bindir)
+ $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
clean:
next reply other threads:[~2005-08-12 21:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-12 21:11 Petr Baudis [this message]
2005-08-12 21:14 ` [PATCH] Fix documentation installation Petr Baudis
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=20050812211145.GA20812@pasky.ji.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
/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