[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 4/7] docs/build: Do not use move-if-changed
Nothing expensive depends on these results. Also prefer $(INSTALL_DATA) over cp to get correct file attributes (see fb33b2b "docs: make .txt files over-writable when building from r/o sources") Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CC: Ian Campbell <Ian.Campbell@xxxxxxxxxx> CC: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> CC: Wei Liu <wei.liu2@xxxxxxxxxx> --- docs/Makefile | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 0b458f1..d31b36f 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -116,8 +116,7 @@ html/index.html: $(DOC_HTML) $(CURDIR)/gen-html-index INDEX html/%.html: %.markdown $(INSTALL_DIR) $(@D) ifdef MARKDOWN - $(MARKDOWN) $< > $@.tmp ; \ - $(call move-if-changed,$@.tmp,$@) + $(MARKDOWN) $< > $@ else @echo "markdown not installed; skipping $*.html." endif @@ -129,8 +128,7 @@ html/%.txt: %.txt html/man/%.1.html: man/%.pod.1 Makefile $(INSTALL_DIR) $(@D) ifdef POD2HTML - $(POD2HTML) --infile=$< --outfile=$@.tmp - $(call move-if-changed,$@.tmp,$@) + $(POD2HTML) --infile=$< --outfile=$@ else @echo "pod2html not installed; skipping $<." endif @@ -138,8 +136,7 @@ endif html/man/%.5.html: man/%.pod.5 Makefile $(INSTALL_DIR) $(@D) ifdef POD2HTML - $(POD2HTML) --infile=$< --outfile=$@.tmp - $(call move-if-changed,$@.tmp,$@) + $(POD2HTML) --infile=$< --outfile=$@ else @echo "pod2html not installed; skipping $<." endif @@ -161,19 +158,16 @@ html/hypercall/%/index.html: $(CURDIR)/xen-headers Makefile txt/%.txt: %.txt $(INSTALL_DIR) $(@D) - cp $< $@.tmp - $(call move-if-changed,$@.tmp,$@) + $(INSTALL_DATA) $< $@ txt/%.txt: %.markdown $(INSTALL_DIR) $(@D) - cp $< $@.tmp - $(call move-if-changed,$@.tmp,$@) + $(INSTALL_DATA) $< $@ txt/man/%.1.txt: man/%.pod.1 Makefile $(INSTALL_DIR) $(@D) ifdef POD2TEXT - $(POD2TEXT) $< $@.tmp - $(call move-if-changed,$@.tmp,$@) + $(POD2TEXT) $< $@ else @echo "pod2text not installed; skipping $<." endif @@ -181,8 +175,7 @@ endif txt/man/%.5.txt: man/%.pod.5 Makefile $(INSTALL_DIR) $(@D) ifdef POD2TEXT - $(POD2TEXT) $< $@.tmp - $(call move-if-changed,$@.tmp,$@) + $(POD2TEXT) $< $@ else @echo "pod2text not installed; skipping $<." endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |