threads / patch / 19104

patch, 2 partsfix some make issues

Subject: [PATCH 0/2] fix some make issues

## tl;dr

4 messages between Apr 28, 2009 and Apr 28, 2009. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Eric Blake· Apr 28, 2009, 12:28 UTC · re: Eric Blake · lore

[PATCH 1/2] Makefile: installing git in cygwin 1.7.0

On platforms with $X, make removes any leftover scripts 'a' from earlier builds if a new binary 'a.exe' is now built. However, on cygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file. Test for file equality before attempting a remove, in order to avoid nuking just-built binaries.

This repeats commit 0d768f7 for the installation destdir.
Signed-off-by: Eric Blake <ebb9@byu.net>
---

This should be a trivial approval, seeing as how it finishes the job of a previous patch (but this time for the installation dir, as opposed to the build dir). Without it, programs like git-var get nuked during 'make install', giving a broken installation.

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to Makefile +1 −1
diff --git a/Makefile b/Makefile
index 5c8e83a..93ca0db 100644
--- a/Makefile
+++ b/Makefile
@@ -1545,7 +1545,7 @@ ifndef NO_TCLTK
 	$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
 endif
 ifneq (,$X)
-	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)
+	$(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';)
 endif
 	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
 	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \

-- 
1.6.3.rc3.2.g4b51
Eric Blake· Apr 28, 2009, 12:28 UTC · re: Eric Blake · lore

[PATCH 2/2] doc: consistently use ASCIIDOC_EXTRA

For all uses of $(ASCIIDOC) in Documentation/Makefile, supply the same options via $(ASCIIDOC_EXTRA).

Signed-off-by: Eric Blake <ebb9@byu.net>
---

I was using asciidoc 8.4.3, and surprised when some, but not all, of the asciidoc invocations used -a asciidoc7compatible.

 Documentation/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Show changes to Documentation/Makefile +3 −3
diff --git a/Documentation/Makefile b/Documentation/Makefile
index e18242a..7a8037f 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -240,7 +240,7 @@ $(MAN_HTML): %.html : %.txt
 	mv $@+ $@

 user-manual.xml: user-manual.txt user-manual.conf
-	$(QUIET_ASCIIDOC)$(ASCIIDOC) -b docbook -d book $<
+	$(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d book $<

 technical/api-index.txt: technical/api-index-skel.txt \
 	technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
@@ -293,13 +293,13 @@ howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
 	mv $@+ $@

 $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
-	$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 $*.txt
+	$(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 $*.txt

 WEBDOC_DEST = /pub/software/scm/git/docs

 $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-	sed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+ && \
+	sed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \
 	mv $@+ $@

 install-webdoc : html

-- 
1.6.3.rc3.2.g4b51

← back to recent threads