From cd6310559310932d63fdfc434d75ed0e84322ca5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 2 Oct 2006 04:07:58 +0000 Subject: [PATCH] Use rm instead of ln -f to replace existing links. (#354849, James Evans) 2006-10-02 Matthias Clasen * gtk/Makefile.am (stamp-icons): Use rm instead of ln -f to replace existing links. (#354849, James Evans) --- ChangeLog | 5 +++++ gtk/Makefile.am | 27 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73bcb2ec98..070c19dfa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-02 Matthias Clasen + + * gtk/Makefile.am (stamp-icons): Use rm instead of ln -f to + replace existing links. (#354849, James Evans) + 2006-10-01 Matthias Clasen * gtk/gtkexpander.c (gtk_expander_realize) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 427da65fb4..cf85bc6e13 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1094,15 +1094,24 @@ stamp-icons: $(STOCK_ICONS) fi && \ for i in 16 24; do \ (cd stock-icons/$$i \ - && $(LN_S) -f gtk-go-forward-ltr.png gtk-go-back-rtl.png \ - && $(LN_S) -f gtk-go-back-ltr.png gtk-go-forward-rtl.png \ - && $(LN_S) -f gtk-goto-last-ltr.png gtk-goto-first-rtl.png \ - && $(LN_S) -f gtk-goto-first-ltr.png gtk-goto-last-rtl.png \ - && $(LN_S) -f gtk-media-rewind-ltr.png gtk-media-forward-rtl.png \ - && $(LN_S) -f gtk-media-previous-ltr.png gtk-media-next-rtl.png \ - && $(LN_S) -f gtk-media-next-ltr.png gtk-media-previous-rtl.png \ - && $(LN_S) -f gtk-media-forward-ltr.png gtk-media-rewind-rtl.png \ - && $(LN_S) -f gtk-floppy.png gtk-save.png) \ + && $(RM) gtk-go-back-rtl.png \ + && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png \ + && $(RM) gtk-go-forward-rtl.png \ + && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png \ + && $(RM) gtk-goto-first-rtl.png \ + && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png \ + && $(RM) gtk-goto-last-rtl.png \ + && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png \ + && $(RM) gtk-media-forward-rtl.png \ + && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png \ + && $(RM) gtk-mdedia-next-rtl.png \ + && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png \ + && $(RM) gtk-media-previous-rtl.png \ + && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png \ + && $(RM) gtk-media-rewind-rtl.png \ + && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png \ + && $(RM) gtk-save.png \ + && $(LN_S) gtk-floppy.png gtk-save.png) \ done \ && touch stamp-icons