remove targets before cp, mv and ln, otherwise ambiguous links and

make errors can result.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
index 60b6cecda844471abf2a8acba4d3b01ca4dc4790..840e37173d9d8d8af1b1e141803a49a5161331a3 100644 (file)
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -112,6 +112,8 @@ distclean: clean
 @COND_USE_XRC_1@install_wxrc: 
 @COND_USE_XRC_1@       $(INSTALL_DIR) $(DESTDIR)$(bindir)
 @COND_USE_XRC_1@       $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+@COND_USE_XRC_1@       rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+@COND_USE_XRC_1@       $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
 @COND_USE_XRC_1@       mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
 @COND_USE_XRC_1@       (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
 

diff --git a/utils/wxrc/wxrc.bkl b/utils/wxrc/wxrc.bkl
index 2ab71f69c9adb927524fe33ac442bb71ca7a9093..d05c53b122e714aa597c3701e6561510cd19679f 100644 (file)
--- a/utils/wxrc/wxrc.bkl
+++ b/utils/wxrc/wxrc.bkl
@@ -20,6 +20,8 @@
         <set var="versioned_name">wxrc-$(WX_RELEASE)</set>
         <modify-target target="install_wxrc">
             <command>
+               rm -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
+               $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)
                 mv -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
                 (cd $(DESTDIR)$(BINDIR) &amp;&amp; $(LN_S) $(versioned_name) wxrc$(EXEEXT))
             </command>