From a07c56d504ec51366a32f696d20e779b1bac79e6 Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 2 Jul 2006 21:43:13 +0000
Subject: 2006-07-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* Merge of HEAD --> generics-branch for
	2006/06/27 to 2006/07/02.
---
 lib/Makefile.am         | 5 +++--
 lib/gen-classlist.sh.in | 2 +-
 lib/standard.omit       | 1 -
 lib/standard.omit.in    | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 lib/standard.omit
 create mode 100644 lib/standard.omit.in

(limited to 'lib')

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 18f0da9ae..0b0d3650f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,7 +10,7 @@ propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax or
 metafiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print)
 iconfiles :=  $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print)
 
-compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(USER_CLASSLIB)
+compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(USER_CLASSLIB):$(PATH_TO_ESCHER)
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_ECJ
@@ -165,7 +165,7 @@ compile-classes: classes $(JAVA_SRCS) Makefile
 	touch compile-classes
 #endif
 
-EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
+EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh
 CLEANFILES = compile-classes resources classes \
 	glibj.zip classes.1 classes.2 \
 	$(top_builddir)/gnu/java/locale/LocaleData.java \
@@ -181,6 +181,7 @@ clean-local:
 	-rm -rf META-INF
 	-rm -rf lists
 	-rm -f Makefile.deps
+	-rm -f standard.omit
 
 dist-hook:
 	mkdir -p $(distdir)
diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in
index 3156db2ee..a0d3a075a 100755
--- a/lib/gen-classlist.sh.in
+++ b/lib/gen-classlist.sh.in
@@ -73,7 +73,7 @@ if test ! "${top_builddir}" -ef "@top_srcdir@"; then
 fi
 
 
-cat @top_srcdir@/lib/$1.omit vm.omit > tmp.omit
+cat $1.omit vm.omit > tmp.omit
 for dir in $vm_dirlist; do
    if test -f $dir/$1.omit; then
       cat $dir/$1.omit >> tmp.omit
diff --git a/lib/standard.omit b/lib/standard.omit
deleted file mode 100644
index a518f7df8..000000000
--- a/lib/standard.omit
+++ /dev/null
@@ -1 +0,0 @@
-../gnu/test/.*$
diff --git a/lib/standard.omit.in b/lib/standard.omit.in
new file mode 100644
index 000000000..d5437d3bd
--- /dev/null
+++ b/lib/standard.omit.in
@@ -0,0 +1 @@
+gnu/test/.*java$
-- 
cgit v1.2.1