2005-11-30 Andrew Haley <aph@redhat.com>

	* classpath/lib/Makefile.am (resources): Use `cp -p'.
	Remove `@' from start of line.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107714 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2d88d05..ddecdcd 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-30  Andrew Haley  <aph@redhat.com>
+
+       * classpath/lib/Makefile.am (resources): Use `cp -p'.
+       Remove `@' from start of line.
+
 2005-11-28  Tom Tromey  <tromey@redhat.com>
 
        PR java/18278:

diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am
index 9d44ef0..5a54a4d 100644 (file)
--- 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 08db2de..394af45 100644 (file)
--- 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