From b6a8dc3ad64ea3ec42c21e6c7299bcba263c323d Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Wed, 30 Nov 2005 12:50:52 +0000 Subject: [PATCH] Makefile.am (resources): Use `cp -p'. 2005-11-30 Andrew Haley * classpath/lib/Makefile.am (resources): Use `cp -p'. Remove `@' from start of line. From-SVN: r107714 --- libjava/ChangeLog | 5 +++++ libjava/classpath/lib/Makefile.am | 16 ++++++++-------- libjava/classpath/lib/Makefile.in | 16 ++++++++-------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2d88d05c1c2b..ddecdcdc8f20 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-11-30 Andrew Haley + + * classpath/lib/Makefile.am (resources): Use `cp -p'. + Remove `@' from start of line. + 2005-11-28 Tom Tromey PR java/18278: diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am index 9d44ef0c5319..5a54a4d698a1 100644 --- a/libjava/classpath/lib/Makefile.am +++ b/libjava/classpath/lib/Makefile.am @@ -78,18 +78,18 @@ resources: copy-vmresources.sh if ! [ -e gnu/java ]; then mkdir gnu/java; fi if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi if ! [ -e gnu/javax/swing/plaf/gtk/icons ]; then mkdir -p gnu/javax/swing/plaf/gtk/icons; fi - @list='$(propertydirs)'; for p in $$list; do \ + list='$(propertydirs)'; for p in $$list; do \ if ! [ -e $$p ]; then mkdir $$p; fi; \ done - @list='$(propertyfiles)'; for p in $$list; do \ - cp $(top_srcdir)/resource/$$p $$p; \ + list='$(propertyfiles)'; for p in $$list; do \ + cp -f $(top_srcdir)/resource/$$p $$p; \ done - @list='$(metafiles)'; for p in $$list; do \ - cp $(top_srcdir)/resource/$$p $$p; \ + list='$(metafiles)'; for p in $$list; do \ + cp -f $(top_srcdir)/resource/$$p $$p; \ done - @$(SHELL) ./copy-vmresources.sh - @list='$(iconfiles)'; for p in $$list; do \ - cp $(top_srcdir)/$$p $$p; \ + $(SHELL) ./copy-vmresources.sh + list='$(iconfiles)'; for p in $$list; do \ + cp -f $(top_srcdir)/$$p $$p; \ done touch resources diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in index 08db2de8eb93..394af457db34 100644 --- a/libjava/classpath/lib/Makefile.in +++ b/libjava/classpath/lib/Makefile.in @@ -498,18 +498,18 @@ resources: copy-vmresources.sh if ! [ -e gnu/java ]; then mkdir gnu/java; fi if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi if ! [ -e gnu/javax/swing/plaf/gtk/icons ]; then mkdir -p gnu/javax/swing/plaf/gtk/icons; fi - @list='$(propertydirs)'; for p in $$list; do \ + list='$(propertydirs)'; for p in $$list; do \ if ! [ -e $$p ]; then mkdir $$p; fi; \ done - @list='$(propertyfiles)'; for p in $$list; do \ - cp $(top_srcdir)/resource/$$p $$p; \ + list='$(propertyfiles)'; for p in $$list; do \ + cp -f $(top_srcdir)/resource/$$p $$p; \ done - @list='$(metafiles)'; for p in $$list; do \ - cp $(top_srcdir)/resource/$$p $$p; \ + list='$(metafiles)'; for p in $$list; do \ + cp -f $(top_srcdir)/resource/$$p $$p; \ done - @$(SHELL) ./copy-vmresources.sh - @list='$(iconfiles)'; for p in $$list; do \ - cp $(top_srcdir)/$$p $$p; \ + $(SHELL) ./copy-vmresources.sh + list='$(iconfiles)'; for p in $$list; do \ + cp -f $(top_srcdir)/$$p $$p; \ done touch resources -- 2.47.2