I'm committing the attached patch, which fixes a problem with the recent
META-INF patch and distcheck (namely that it isn't deleted, due to permissions
made during creation).

Changelog:

2005-06-02  Andrew John Hughes  <[EMAIL PROTECTED]>

        * lib/Makefile.am:
        Fix permissions problem with creation of META-INF tree.

-- 
Andrew :-)

Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html

No software patents in Europe -- http://nosoftwarepatents.com

"Value your freedom, or you will lose it, teaches history. 
`Don't bother us with politics' respond those who don't want to learn." 
-- Richard Stallman

Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.85
diff -u -3 -p -u -r1.85 Makefile.am
--- lib/Makefile.am     25 May 2005 22:26:30 -0000      1.85
+++ lib/Makefile.am     2 Jun 2005 23:05:44 -0000
@@ -5,8 +5,9 @@ JAVA_DEPEND = java.dep
 ## this file and restart the make process again
 sinclude $(JAVA_DEPEND)
 
-propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org 
-type d ! -name CVS -print)
+propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org 
META-INF -type d ! -name CVS -print)
 propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org 
-name \*\.properties -print)
+metafiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -print)
 
 compile_classpath = 
$(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:.:$(USER_CLASSLIB)
 
@@ -83,8 +84,9 @@ resources:
        @list='$(propertyfiles)'; for p in $$list; do \
          cp $(top_srcdir)/resource/$$p $$p; \
        done
-       if [ -e META-INF ]; then rm -rf META-INF; fi
-       cp -r $(top_srcdir)/resource/META-INF .
+       @list='$(metafiles)'; for p in $$list; do \
+         cp $(top_srcdir)/resource/$$p $$p; \
+       done
        touch resources
 
 classes: genclasses

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches

Reply via email to