{"thread":{"id":"19104","subject":"[PATCH 0/2] fix some make issues","startedAt":"2009-04-28T12:28:30Z","lastAt":"2009-04-28T20:09:43Z","messageCount":4,"participants":["Eric Blake","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"112512","messageId":"1240921712-3100-1-git-send-email-ebb9@byu.net","threadId":"19104","inReplyTo":null,"subject":"[PATCH 0/2] fix some make issues","fromName":"Eric Blake","fromEmail":"ebb9@byu.net","sentAt":"2009-04-28T12:28:30Z","receivedAt":"2009-04-28T12:28:30Z","isPatch":true,"sender":{"key":"eblake@redhat.com","avatar":"https://avatars.githubusercontent.com/u/32933908?v=4"},"body":"I had to fix a couple of make issues as part of preparing a git\npackage for cygwin 1.7.\n"},{"id":"112513","messageId":"1240921712-3100-2-git-send-email-ebb9@byu.net","threadId":"19104","inReplyTo":"1240921712-3100-1-git-send-email-ebb9@byu.net","subject":"[PATCH 1/2] Makefile: installing git in cygwin 1.7.0","fromName":"Eric Blake","fromEmail":"ebb9@byu.net","sentAt":"2009-04-28T12:28:31Z","receivedAt":"2009-04-28T12:28:31Z","isPatch":true,"sender":{"key":"eblake@redhat.com","avatar":"https://avatars.githubusercontent.com/u/32933908?v=4"},"body":"On platforms with $X, make removes any leftover scripts 'a' from\nearlier builds if a new binary 'a.exe' is now built.  However, on\ncygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file.\nTest for file equality before attempting a remove, in order to avoid\nnuking just-built binaries.\n\nThis repeats commit 0d768f7 for the installation destdir.\n\nSigned-off-by: Eric Blake <ebb9@byu.net>\n---\n\nThis should be a trivial approval, seeing as how it finishes the\njob of a previous patch (but this time for the installation dir,\nas opposed to the build dir).  Without it, programs like git-var\nget nuked during 'make install', giving a broken installation.\n\n Makefile |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 5c8e83a..93ca0db 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1545,7 +1545,7 @@ ifndef NO_TCLTK\n \t$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install\n endif\n ifneq (,$X)\n-\t$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)\n+\t$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)\n endif\n \tbindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \\\n \texecdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \\\n-- \n1.6.3.rc3.2.g4b51\n"},{"id":"112515","messageId":"1240921712-3100-3-git-send-email-ebb9@byu.net","threadId":"19104","inReplyTo":"1240921712-3100-2-git-send-email-ebb9@byu.net","subject":"[PATCH 2/2] doc: consistently use ASCIIDOC_EXTRA","fromName":"Eric Blake","fromEmail":"ebb9@byu.net","sentAt":"2009-04-28T12:28:32Z","receivedAt":"2009-04-28T12:28:32Z","isPatch":true,"sender":{"key":"eblake@redhat.com","avatar":"https://avatars.githubusercontent.com/u/32933908?v=4"},"body":"For all uses of $(ASCIIDOC) in Documentation/Makefile, supply the same\noptions via $(ASCIIDOC_EXTRA).\n\nSigned-off-by: Eric Blake <ebb9@byu.net>\n---\n\nI was using asciidoc 8.4.3, and surprised when some, but not all, of the\nasciidoc invocations used -a asciidoc7compatible.\n\n Documentation/Makefile |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex e18242a..7a8037f 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -240,7 +240,7 @@ $(MAN_HTML): %.html : %.txt\n \tmv $@+ $@\n\n user-manual.xml: user-manual.txt user-manual.conf\n-\t$(QUIET_ASCIIDOC)$(ASCIIDOC) -b docbook -d book $<\n+\t$(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d book $<\n\n technical/api-index.txt: technical/api-index-skel.txt \\\n \ttechnical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))\n@@ -293,13 +293,13 @@ howto-index.txt: howto-index.sh $(wildcard howto/*.txt)\n \tmv $@+ $@\n\n $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt\n-\t$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 $*.txt\n+\t$(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 $*.txt\n\n WEBDOC_DEST = /pub/software/scm/git/docs\n\n $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt\n \t$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \\\n-\tsed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+ && \\\n+\tsed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \\\n \tmv $@+ $@\n\n install-webdoc : html\n-- \n1.6.3.rc3.2.g4b51\n"},{"id":"112550","messageId":"7vfxfsleuw.fsf@gitster.siamese.dyndns.org","threadId":"19104","inReplyTo":"1240921712-3100-3-git-send-email-ebb9@byu.net","subject":"Re: [PATCH 2/2] doc: consistently use ASCIIDOC_EXTRA","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-04-28T20:09:43Z","receivedAt":"2009-04-28T20:09:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Both patches look correct; thanks.\n"}]}