From e912d1d45ef893ddec2643bbcea72ab5b5693e1c Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 10 Oct 2006 19:17:54 +0000 Subject: [PATCH] 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 --- utils/wxrc/Makefile.in | 2 ++ utils/wxrc/wxrc.bkl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index 60b6cecda8..840e37173d 100644 --- 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 2ab71f69c9..d05c53b122 100644 --- a/utils/wxrc/wxrc.bkl +++ b/utils/wxrc/wxrc.bkl @@ -20,6 +20,8 @@ wxrc-$(WX_RELEASE) + 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) && $(LN_S) $(versioned_name) wxrc$(EXEEXT)) -- 2.47.2