Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.72
diff -u -r1.72 Makefile.am
--- lib/Makefile.am	19 Dec 2004 21:15:59 -0000	1.72
+++ lib/Makefile.am	20 Dec 2004 13:45:31 -0000
@@ -79,7 +79,8 @@
 classes: genclasses
 
 genclasses: gen-classlist.sh standard.omit
-	$(top_srcdir)/scripts/generate-locale-list.sh > $(top_srcdir)/java/util/LocaleData.java
+	mkdir -p java/util
+	$(top_srcdir)/scripts/generate-locale-list.sh > java/util/LocaleData.java
 	top_builddir=$(top_builddir) $(SHELL) ./gen-classlist.sh standard
 
 $(JAVA_DEPEND): genclasses
Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.16
diff -u -r1.16 gen-classlist.sh.in
--- lib/gen-classlist.sh.in	11 Nov 2004 15:17:38 -0000	1.16
+++ lib/gen-classlist.sh.in	20 Dec 2004 13:45:31 -0000
@@ -3,7 +3,7 @@
 if test "@top_srcdir@" = "${top_builddir}"; then
   @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org @top_srcdir@/vm/reference -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
 else
-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org ${top_builddir}/gnu @top_srcdir@/vm/reference -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
+  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org ${top_builddir}/gnu ${top_builddir}/java @top_srcdir@/vm/reference -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
 fi
 
 for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < ${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done
Index: scripts/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/scripts/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- scripts/Makefile.am	16 Nov 2004 08:13:04 -0000	1.1
+++ scripts/Makefile.am	20 Dec 2004 13:45:31 -0000
@@ -1,2 +1,2 @@
 
-EXTRA_DIST = check_jni_methods.sh
+EXTRA_DIST = check_jni_methods.sh generate-locale-list.sh