diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 2 | ||||
| -rw-r--r-- | lib/standard.omit.in | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 282c25579..31dd36aeb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -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 ff76a22ea..c6a3a5aa5 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -66,7 +66,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.in b/lib/standard.omit.in index a518f7df8..d5437d3bd 100644 --- a/lib/standard.omit.in +++ b/lib/standard.omit.in @@ -1 +1 @@ -../gnu/test/.*$ +gnu/test/.*java$ |