diff options
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 9ec3a549ccc..4f663a0c9c5 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -864,20 +864,40 @@ gnu/gcj/xlib/natXUnmapEvent.cc 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 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) |
