Index: doc/api/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/api/Makefile.am,v
retrieving revision 1.10
diff -u -b -B -r1.10 Makefile.am
--- doc/api/Makefile.am	30 Nov 2003 14:26:44 -0000	1.10
+++ doc/api/Makefile.am	2 Aug 2004 14:46:22 -0000
@@ -4,7 +4,7 @@
 
 EXTRA_DIST = classpath-copyright.xml
 
-htmllist := $(shell $(FIND) html | grep -v "^html$$")
+htmllist := $(shell $(FIND) html -print | grep -v "^html$$")
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/api
@@ -30,8 +30,8 @@
 #html: create_xml create_catalog create_html
 html: create_html
 
-core := $(shell cd $(top_srcdir) && $(FIND) java javax -type d ! -regex .*CVS ! -regex .*doc-files | tr '/' '.' | grep -v "java.awt.dnd.peer" | grep -v "java.awt.peer")
-jaxp := $(shell cd $(top_srcdir)/external/jaxp/source && $(FIND) javax org -type d ! -regex .*CVS | tr '/' '.' | grep -v "org.w3c.dom.")
+core := $(shell cd $(top_srcdir) && $(FIND) java javax -type d ! -name CVS ! -name doc-files -print | tr '/' '.' | grep -v "java.awt.dnd.peer" | grep -v "java.awt.peer")
+jaxp := $(shell cd $(top_srcdir)/external/jaxp/source && $(FIND) javax org -type d ! -name CVS -print | tr '/' '.' | grep -v "org.w3c.dom.")
 
 # Just generate api doc for the core packages.
 # Adding the external ones takes a lot more time and we should reference
Index: external/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/external/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- external/Makefile.am	17 Aug 2003 19:57:07 -0000	1.1
+++ external/Makefile.am	2 Aug 2004 14:46:22 -0000
@@ -3,7 +3,7 @@
 # When importing a new version of jaxp.
 # You need to add the output of the following command to the
 # jaxp_FILES in Makefile.am (remove the last \ from the last entry):
-# $ for i in $(find jaxp -type f | grep -v CVS); do echo $i \\; done
+# $ for i in $(find jaxp -type f -print | grep -v CVS); do echo $i \\; done
 
 jaxp_FILES = \
 jaxp/source/gnu/xml/aelfred2/JAXPFactory.java \
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.62
diff -u -b -B -r1.62 Makefile.am
--- lib/Makefile.am	29 Jul 2004 19:56:07 -0000	1.62
+++ lib/Makefile.am	2 Aug 2004 14:46:22 -0000
@@ -13,8 +13,8 @@
 USER_JAVAH = @USER_JAVAH@
 FIND = @FIND@
 
-propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java -type d ! -regex .*CVS)
-propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java -name \*\.properties)
+propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java -type d ! -name CVS -print)
+propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java -name \*\.properties -print)
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_GCJ