{"thread":{"id":"1486","subject":"[PATCH] Fix documentation installation","startedAt":"2005-08-12T21:11:45Z","lastAt":"2005-08-12T21:14:19Z","messageCount":2,"participants":["Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"7145","messageId":"20050812211145.GA20812@pasky.ji.cz","threadId":"1486","inReplyTo":null,"subject":"[PATCH] Fix documentation installation","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-08-12T21:11:45Z","receivedAt":"2005-08-12T21:11:45Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Documentation's install target now depends on man since\nit installs manpages. It now also installs the .txt files, to\n$prefix/share/doc/cogito/txt/ by default. A separate install-html target\nwas added for installing .html files to $prefix/share/doc/cogito/html/. It\nisn't part of the install target since building HTML might cause problems\non some asciidoc installations (like, well, mine) as xhtml11 appears\nnot to be an official asciidoc plugin, or so asciidoc claims.\n\nThe missing dependency was pointed out by Jonas Fonseca.\n\nSigned-off-by: Petr Baudis <pasky@suse.cz>\n\n---\ncommit e7b483b293fb7d359dcebf974e6784f8b14f2ab1\ntree 5e998614a0dbce85758de5be847306837953bb42\nparent 2b0289c3805d0c99eb031a7116948a3cb4ddf332\nauthor Petr Baudis <pasky@suse.cz> Fri, 12 Aug 2005 22:58:13 +0200\ncommitter Petr Baudis <xpasky@machine.sinus.cz> Fri, 12 Aug 2005 22:58:13 +0200\n\n Documentation/Makefile |   12 +++++++++++-\n 1 files changed, 11 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -11,6 +11,9 @@ bin=$(prefix)/bin\n mandir=$(prefix)/man\n man1=$(mandir)/man1\n man7=$(mandir)/man7\n+docdir=$(prefix)/share/doc/git-core\n+txtdir=$(docdir)/txt\n+htmldir=$(docdir)/html\n # DESTDIR=\n \n INSTALL=install\n@@ -33,11 +36,18 @@ man: man1 man7\n man1: $(DOC_MAN1)\n man7: $(DOC_MAN7)\n \n-install:\n+install: man\n+\t$(INSTALL) -m755 -d $(DESTDIR)/$(txtdir)\n+\t$(INSTALL) $(MAN1_TXT) $(MAN7_TXT) $(DESTDIR)/$(txtdir)\n \t$(INSTALL) -m755 -d $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)\n \t$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)\n \t$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)\n \n+install-html: html\n+\t$(INSTALL) -m755 -d $(DESTDIR)/$(htmldir)\n+\t$(INSTALL) $(DOC_HTML) $(DESTDIR)/$(htmldir)\n+\n+\n # 'include' dependencies\n git-diff-%.txt: diff-format.txt diff-options.txt\n \ttouch $@\ndiff --git a/tools/Makefile b/tools/Makefile\n--- a/tools/Makefile\n+++ b/tools/Makefile\n@@ -18,7 +18,7 @@ git-%: %.c\n all: $(PROGRAMS)\n \n install: $(PROGRAMS) $(SCRIPTS)\n-\t$(INSTALL) -m755 -d $(dest)$(bindir)\n+\t$(INSTALL) -m755 -d $(DESTDIR)$(bindir)\n \t$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)\n \n clean:\n"},{"id":"7146","messageId":"20050812211418.GB20812@pasky.ji.cz","threadId":"1486","inReplyTo":"20050812211145.GA20812@pasky.ji.cz","subject":"Re: [PATCH] Fix documentation installation","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-08-12T21:14:19Z","receivedAt":"2005-08-12T21:14:19Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Fri, Aug 12, 2005 at 11:11:45PM CEST, I got a letter\nwhere Petr Baudis <pasky@suse.cz> told me that...\n> diff --git a/tools/Makefile b/tools/Makefile\n> --- a/tools/Makefile\n> +++ b/tools/Makefile\n> @@ -18,7 +18,7 @@ git-%: %.c\n>  all: $(PROGRAMS)\n>  \n>  install: $(PROGRAMS) $(SCRIPTS)\n> -\t$(INSTALL) -m755 -d $(dest)$(bindir)\n> +\t$(INSTALL) -m755 -d $(DESTDIR)$(bindir)\n>  \t$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)\n>  \n>  clean:\n\nI should read patches after myself, especially when messing with them.\nThis hunk is obviously superflous, so feel free to drop it from that\npatch if you are in a \"patch purity\" mood. OTOH it is obviously valid\nfix. :-)\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nIf you want the holes in your knowledge showing up try teaching\nsomeone.  -- Alan Cox\n"}]}