Makefile.am (GJDOC_EX): Use find -name pattern -prune -o.

2010-01-18  Andreas Tobler  <andreast@fgznet.ch>

	* tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o.
	* tools/Makefile.in: Regenerate.

From-SVN: r156023

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 69d8754321367e7327bca44499ba96e5a846d09e..fa4171ba5bc48b7cc7860d37aa6587680308ccf4 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Andreas Tobler  <andreast@fgznet.ch>
+
+       * tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o.
+       * tools/Makefile.in: Regenerate.
+
 2009-12-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.in: Regenerate.

diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index dfaaf024d3b6e29771d2b864aa944b4823666de1..44bc49fdf292a93a371df61c7c819c7132966527 100755 (executable)
--- a/libjava/classpath/tools/Makefile.am
+++ b/libjava/classpath/tools/Makefile.am
@@ -277,12 +277,10 @@ gjdoc_resources = $(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjd
        $(gnu_classpath_tools_gjdoc_jar_XHTML) $(gnu_classpath_tools_gjdoc_jar_XSLS)
 
 if !CREATE_GJDOC
-GJDOC_EX = -path '*gnu/classpath/tools/gjdoc' -prune -o \
-       -path '*gnu/classpath/tools/doclets' -prune -o \
-       -path '*gnu/classpath/tools/taglets' -prune -o \
-       -path '*com/sun/javadoc' -prune -o \
-       -path '*com/sun/tools/doclets' -prune -o \
-       -path '*com/sun/tools/javadoc' -prune -o
+GJDOC_EX = -name gjdoc -prune -o \
+       -name doclets -prune -o \
+       -name taglets -prune -o \
+       -name javadoc -prune -o
 endif
 
 # The zip files with classes we want to produce.

diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in
index 54e689f5fa92d3efdd359a496bc3b21761020622..1258e32895807c556b09a503759612babe461ba1 100644 (file)
--- a/libjava/classpath/tools/Makefile.in
+++ b/libjava/classpath/tools/Makefile.in
@@ -684,12 +684,10 @@ gjdoc_resources = $(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjd
        $(gnu_classpath_tools_gjdoc_jar_RNGS) $(gnu_classpath_tools_gjdoc_jar_TXTS) \
        $(gnu_classpath_tools_gjdoc_jar_XHTML) $(gnu_classpath_tools_gjdoc_jar_XSLS)
 
-@CREATE_GJDOC_FALSE@GJDOC_EX = -path '*gnu/classpath/tools/gjdoc' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*gnu/classpath/tools/doclets' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*gnu/classpath/tools/taglets' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*com/sun/javadoc' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*com/sun/tools/doclets' -prune -o \
-@CREATE_GJDOC_FALSE@   -path '*com/sun/tools/javadoc' -prune -o
+@CREATE_GJDOC_FALSE@GJDOC_EX = -name gjdoc -prune -o \
+@CREATE_GJDOC_FALSE@   -name doclets -prune -o \
+@CREATE_GJDOC_FALSE@   -name taglets -prune -o \
+@CREATE_GJDOC_FALSE@   -name javadoc -prune -o
 
 
 # The zip files with classes we want to produce.