diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | lib/Makefile.am | 12 |
2 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2005-12-18 Guilhem Lavaux <guilhem@kaffe.org> + + * libraries/javalib/external/classpath/lib/Makefile.am: + Replaced $(top_distdir) with $(distdir)/.. to make sure + that GNU Classpath's class library sources don't end up + in the wrong location in kaffe's tarball. + 2005-12-18 Nicolas Geoffray <nicolas.geoffray@menlina.com> * java/lang/Class.java (getModifiers): Only returns diff --git a/lib/Makefile.am b/lib/Makefile.am index f40bbd292..73531d83c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -153,10 +153,10 @@ clean-local: dist-hook: mkdir -p $(distdir) - cp -dfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/vm $(top_srcdir)/resource $(top_distdir) + cp -dfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/.. # Delete not wanted files. - $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm $(top_distdir)/resource -name CVS -print | xargs rm -fr - $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm $(top_distdir)/resource -name .cvsignore -print | xargs rm -f - $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm -name class-dependencies.conf -print | xargs rm -f - rm -f $(top_distdir)/gnu/classpath/Configuration.java - rm -f $(top_distdir)/java/util/LocaleData.java + $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr + $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f + $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f + rm -f $(distdir)/../gnu/classpath/Configuration.java + rm -f $(distdir)/../java/util/LocaleData.java |