Update src.zip rule post-Big Merge

[Thomas Fitzsimmons <fitzsim at redhat dot com>]

Hi,

The rule for building src.zip was not updated when the Big Merge
happened.  As a result only source files that libgcj overrides were
being added to src.zip.  This patch updates the search paths and makes
libgcj classes override their GNU Classpath counterparts.

OK for HEAD and 4.1 branch?
Tom

2006-02-03  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (src.zip): Update src.zip file search to look in
	classpath directory.
	* Makefile.in: Regenerate.

Index: Makefile.am
===================================================================
--- Makefile.am	(revision 110559)
+++ Makefile.am	(working copy)
@@ -864,20 +864,40 @@
 src.zip:
 	-rm -f src.zip
 	here=`pwd`; \
-	( ( cd $(srcdir); \
+	( \
+	  ( cd $(srcdir)/classpath; \
 	  find java gnu javax org -name '*.java' -print | \
 	  while read file; do \
 ## Ugly code to avoid "echo -C".  Must separate each entry by a newline
 ## Gross but easy.
 	    echo "x-C" | sed -e 's/^.//'; \
-	    echo $(srcdir); \
+	    echo $(srcdir)/classpath; \
 	    echo $$file; \
 	  done ); \
 ## Now the build tree.
-	  find gnu java -name '*.java' -print) | \
+	  ( cd classpath; \
+	    find gnu java -name '*.java' -print | \
+	    while read file; do \
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo `pwd`; \
+	    echo $$file; \
+	  done ); \
+	) | \
 ## Many of the above circumlocutions are because ZIP will most likely
 ## be a relative path to fastjar.
 	$(ZIP) -cfM@ $$here/src.zip
+## Override GNU Classpath sources with libgcj replacements.
+	here=`pwd`; \
+	( \
+	  ( cd $(srcdir); \
+	  find gcj gnu java -name '*.java' -print | \
+	  while read file; do \
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo $(srcdir); \
+	    echo $$file; \
+	  done ); \
+	) | \
+	$(ZIP) -ufM@ $$here/src.zip
 
 ## We use a variable for this in case the user wants to override it.
 sourcesdir = $(jardir)