Hi all,
I've checked in a fix from Guilhem to make sure that GNU Classpath's
sources for the part of the class libraries written in the Java
programming language end up in the right subdirectory of GNU Classpath,
rather than in top_distdir. That fixes make distcheck for Kaffe, which
uses a regularly updated checkout of GNU Classpath.
cheers,
dalibor topic
2005-12-18 Guilhem Lavaux <[EMAIL PROTECTED]>
* 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.
Index: lib/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.106
diff -u -r1.106 Makefile.am
--- lib/Makefile.am 13 Dec 2005 01:20:29 -0000 1.106
+++ lib/Makefile.am 18 Dec 2005 18:37:50 -0000
@@ -153,10 +153,10 @@
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
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
