[lmi-commits] [lmi] master 45cbda5 3/3: Experimentally use 'cp' where 'mv' fails

[Greg Chicares]

branch: master
commit 45cbda55d3184d0d5f25b3fd75bf05dd6aaa819c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Experimentally use 'cp' where 'mv' fails
    
    Changed several makefiles to try to fix this problem:
      https://lists.nongnu.org/archive/html/lmi/2018-03/msg00017.html
    
    * install_mingw.make: Replaced 'mv'...'rmdir' with 'cp -a'...'rm -rf'.
    * install_wx.make: Replaced 'mv' with 'cp -a'; didn't remove the
        original because 'clobber_exec_prefix_only' does that.
    * install_wxpdfdoc.make: ditto
    
    Didn't change these files:
      install_libxml2_libxslt.make: doesn't use 'mv'
      install_miscellanea.make: no problem observed
---
 install_mingw.make    | 6 +++---
 install_wx.make       | 2 +-
 install_wxpdfdoc.make | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install_mingw.make b/install_mingw.make
index e190e23..df0f717 100644
--- a/install_mingw.make
+++ b/install_mingw.make
@@ -67,12 +67,12 @@ $(MinGW-7_2_0)-md5 := f34ff6eca4aa7a645f60c977b107c5d2
 # Utilities 
####################################################################
 
 BSDTAR := bsdtar
+CP     := cp
 ECHO   := echo
 MD5SUM := md5sum
 MKDIR  := mkdir
 MV     := mv
 RM     := rm
-RMDIR  := rmdir
 WGET   := wget
 
 # Error messages 
###############################################################
@@ -101,8 +101,8 @@ scratch_exists = \
 
 .PHONY: all
 all: $(file_list)
-       $(MV) scratch/mingw32 $(prefix)
-       $(RMDIR) scratch
+       $(CP) --archive scratch/mingw32 $(prefix)
+       $(RM) --force --recursive scratch
 
 $(file_list): initial_setup
 
diff --git a/install_wx.make b/install_wx.make
index 29cae92..7cc9947 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -194,7 +194,7 @@ WGETFLAGS :=
        cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS) $(address@hidden)
        cd $(cache_dir) && $(ECHO) "$(address@hidden) *$@" | $(MD5SUM) --check
        -$(UNZIP) $(UNZIPFLAGS) $(cache_dir)/$@ -d $(wx_dir)
-       mv $(wx_dir)/$(basename $@) $(source_dir)
+       cp -a $(wx_dir)/$(basename $@) $(source_dir)
 
 .PHONY: wx
 wx:
diff --git a/install_wxpdfdoc.make b/install_wxpdfdoc.make
index e8674c6..9ea6783 100644
--- a/install_wxpdfdoc.make
+++ b/install_wxpdfdoc.make
@@ -109,7 +109,7 @@ WGETFLAGS :=
        cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS) $(address@hidden)
        cd $(cache_dir) && $(ECHO) "$(address@hidden) *$@" | $(MD5SUM) --check
        -$(UNZIP) $(UNZIPFLAGS) $(cache_dir)/$@ -d $(wxpdfdoc_dir)
-       mv $(wxpdfdoc_dir)/$(basename $@) $(source_dir)
+       cp -a $(wxpdfdoc_dir)/$(basename $@) $(source_dir)
 
 .PHONY: wxpdfdoc
 wxpdfdoc: $(wxpdfdoc_archive)