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@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/docs/Makefile b/docs/Makefile
index 0b458f16517399875718ac86ea5e913df50bbd07..d31b36facccda58c6c031f9b9d90170b24db8599 100644 (file)
--- 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