[PATCH] Fix documentation installation

Petr Baudis· Aug 12, 2005, 21:11 UTC · lore

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(-)

Show changes to 2 files +12 −2

Documentation/Makefile, tools/Makefile

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:

Petr Baudis· Aug 12, 2005, 21:14 UTC · re: Petr Baudis · lore

Re: [PATCH] Fix documentation installation

Dear diary, on Fri, Aug 12, 2005 at 11:11:45PM CEST, I got a letter where Petr Baudis <pasky@suse.cz> told me that...

Show 12 quoted lines

> 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:

I should read patches after myself, especially when messing with them. This hunk is obviously superflous, so feel free to drop it from that patch if you are in a "patch purity" mood. OTOH it is obviously valid fix. :-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox

patchFix documentation installation