From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH 4/7] docs/build: Do not use move-if-changed
Date: Tue, 21 Apr 2015 15:12:40 +0100
Message-ID: <1429625560.4743.109.camel@citrix.com>
References: <1429526966-18874-1-git-send-email-andrew.cooper3@citrix.com>
	<1429526966-18874-5-git-send-email-andrew.cooper3@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1429526966-18874-5-git-send-email-andrew.cooper3@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>, Ian Jackson <Ian.Jackson@eu.citrix.com>, Xen-devel <xen-devel@lists.xen.org>
List-Id: xen-devel@lists.xenproject.org

On Mon, 2015-04-20 at 11:49 +0100, Andrew Cooper wrote:
> Nothing expensive depends on these results.

But are those uses a problem?

> 
> 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>
> ---
>  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