Patch: FYI: PR 26688
Tom Tromey
tromey@redhat.com
Thu Mar 16 01:54:00 GMT 2006
I'm checking this in.
This fixes a Makefile buglet as pointed out by PR 26688.
We need to exclude .svn directories in a certain part of the
Classpath build.
Tom
Index: ChangeLog.gcj
from Tom Tromey <tromey@redhat.com>
PR libgcj/26688:
* lib/Makefile.in: Rebuilt.
* lib/Makefile.am (propertydirs): Ignore .svn directories.
(metafiles): Likewise.
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am (revision 112101)
+++ lib/Makefile.am (working copy)
@@ -5,9 +5,11 @@
## this file and restart the make process again
sinclude $(JAVA_DEPEND)
-propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print)
+## GCJ LOCAL: prune .svn directories
+propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print | fgrep -v .svn)
propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print)
-metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print)
+metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print | fgrep -v .svn)
+## END GCJ LOCAL
iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print)
compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB)
More information about the Java-patches
mailing list