From 435b70f564a334ffa851d7395c1e1da9290765dc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 15 Oct 2019 12:55:08 +0100 Subject: [PATCH] customize, v2v: Remove existing file before copying. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The generator creates these files with 0444 mode, so they cannot be overwritten by a simple ‘cp’ command. We could use ‘cp -f’ or ‘rm -f’. Fixes commit 15394cb4ddb08f4650fc45bc6ca617ade6ec51a2. --- customize/Makefile.am | 2 ++ v2v/Makefile.am | 2 ++ 2 files changed, 4 insertions(+) diff --git a/customize/Makefile.am b/customize/Makefile.am index 7a76159ca..a39308d26 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -67,8 +67,10 @@ BUILT_SOURCES = \ # These are created by the generator in common/mlcustomize and # need to be copied here. customize_cmdline.mli: $(top_srcdir)/common/mlcustomize/customize_cmdline.mli + rm -f $@ cp $< $@ customize_cmdline.ml: $(top_srcdir)/common/mlcustomize/customize_cmdline.ml + rm -f $@ cp $< $@ if HAVE_OCAML diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 4972b877e..ed145e644 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -188,8 +188,10 @@ output_rhv_upload_vmcheck_source.ml: $(srcdir)/rhv-upload-vmcheck.py # These are created by the generator in common/mlv2v and # need to be copied here. uefi.mli: $(top_srcdir)/common/mlv2v/uefi.mli + rm -f $@ cp $< $@ uefi.ml: $(top_srcdir)/common/mlv2v/uefi.ml + rm -f $@ cp $< $@ if HAVE_OCAML