From 6ca9029d36ad401f350bbf704613414e382130ef Mon Sep 17 00:00:00 2001 From: Stefan Ring Date: Thu, 10 Mar 2011 14:41:43 +0100 Subject: [PATCH] * src/mm/boehm-gc/Makefile.am, src/mm/boehm-gc/libatomic_ops/Makefile.am: Repair make distcheck. This is extremely fragile. It works now on my Fedora 14 box with the following build script: CONFIGURE_ARGS="--with-java-runtime-library-prefix=$CLASSPATH_PREFIX --with-jasmin-jar=$ADDITIONAL_JARS_PATH/cup.jar:$ADDITIONAL_JARS_PATH/jasmin-sable.jar" hg clone $SRCDIR/cacao cd cacao (cd src/mm/boehm-gc && sh ./autogen.sh) (cd src/mm/boehm-gc/libatomic_ops && autoreconf) ./autogen.sh && ./configure $CONFIGURE_ARGS --enable-maintainer-mode && make -j4 || exit 1 make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS" --- src/mm/boehm-gc/Makefile.am | 1 + src/mm/boehm-gc/libatomic_ops/Makefile.am | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/mm/boehm-gc/Makefile.am b/src/mm/boehm-gc/Makefile.am index f386f14f1..4679b05cc 100644 --- a/src/mm/boehm-gc/Makefile.am +++ b/src/mm/boehm-gc/Makefile.am @@ -31,6 +31,7 @@ # SUBDIRS = # endif SUBDIRS = +DIST_SUBDIRS = libatomic_ops ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include diff --git a/src/mm/boehm-gc/libatomic_ops/Makefile.am b/src/mm/boehm-gc/libatomic_ops/Makefile.am index da64dc2ba..f6455d66c 100644 --- a/src/mm/boehm-gc/libatomic_ops/Makefile.am +++ b/src/mm/boehm-gc/libatomic_ops/Makefile.am @@ -1,3 +1,6 @@ SUBDIRS = src doc tests #distclean-local: + +dist-hook: + -rm $(distdir)/config.status -- 2.25.1