Hi,

The new top-level sun dir caused some problems for distcheck. Fixed as
follows:

2006-06-10  Mark Wielaard  <[EMAIL PROTECTED]>

        * lib/.cvsignore: Add sun.
        * lib/Makefile.am (dist-hook): Likewise.

Committed,

Mark
Index: lib/.cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/.cvsignore,v
retrieving revision 1.20
diff -u -r1.20 .cvsignore
--- lib/.cvsignore	1 May 2006 15:48:51 -0000	1.20
+++ lib/.cvsignore	10 Jun 2006 11:09:06 -0000
@@ -28,6 +28,7 @@
 classes.1
 resources
 org
+sun
 META-INF
 Makefile.deps
 lists
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.118
diff -u -r1.118 Makefile.am
--- lib/Makefile.am	9 Jun 2006 21:30:44 -0000	1.118
+++ lib/Makefile.am	10 Jun 2006 11:09:06 -0000
@@ -184,10 +184,10 @@
 
 dist-hook:
 	mkdir -p $(distdir)
-	cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/..
+	cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/sun $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/..
 # Delete not wanted files.
-	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr
-	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f
-	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f
+	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr
+	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f
+	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f
 	rm -f $(distdir)/../gnu/classpath/Configuration.java
 	rm -f $(distdir)/../gnu/java/locale/LocaleData.java

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to