libjava/testsuite/Makefile.in

Tue May 22 18:12:00 GMT 2001

While looking for a cause to my being unable to run
libstdc++-v3/testsuite properly, I came across something in
libjava/testsuite.
A simple diff -ub libjava/testsuite/Makefile.in
libstdc++-v3/testsuite/Makefile.in will help to demonstrate:
...
@@ -162,15 +156,10 @@
 subdir = testsuite
 distdir: $(DISTFILES)
 - here=`cd $(top_builddir) && pwd`; \
 - top_distdir=`cd $(top_distdir) && pwd`; \
 - distdir=`cd $(distdir) && pwd`; \
 - cd $(top_srcdir) \
 - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign testsuite/Makefile
 @for file in $(DISTFILES); do \
 - d=$(srcdir); \
 + if test -f $$file; then d=.; else d=$(srcdir); fi; \
 if test -d $$d/$$file; then \
 - cp -pr $$/$$file $(distdir)/$$file; \
 + cp -pr $$d/$$file $(distdir)/$$file; \
 else \
 test -f $(distdir)/$$file \
 || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
...
I've cut mostly irrelevant differences. If you look close at
libjava/testsuite/Makefile.in:173, you'll notice '$$/$$file'. This could
cause some problems with make dist.
I've seen this on a few different projects where someone used an
automake from cvs. However, the header comment doesn't indicate other
than automake 1.4. Still, I believe this will be fixed if a 'good'
automake is run to gen a new Makefile.in:

--- Makefile.in.orig Tue May 22 20:04:58 2001
+++ Makefile.in Tue May 22 20:06:48 2001
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p1 from Makefile.am
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -73,9 +73,9 @@
 DIRLTDL = @DIRLTDL@
 DIVIDESPEC = @DIVIDESPEC@
 DLLTOOL = @DLLTOOL@
-EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
 EXCEPTIONSPEC = @EXCEPTIONSPEC@
 EXEEXT = @EXEEXT@
+GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
 GCDEPS = @GCDEPS@
 GCINCS = @GCINCS@
 GCJ = @GCJ@
@@ -123,14 +123,10 @@
 AUTOMAKE_OPTIONS = foreign dejagnu
 # Setup the testing framework, if you have one
-EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \
- echo $(top_builddir)/../expect/expect ; \
- else echo expect ; fi`
+EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then echo $(top_builddir)/../expect/expect ; else
echo expect ; fi`
-RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
- echo $(top_srcdir)/../dejagnu/runtest ; \
- else echo runtest; fi`
+RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then echo $(top_srcdir)/../dejagnu/runtest ; else echo runtest; fi`
 RUNTESTFLAGS = @AM_RUNTESTFLAGS@
@@ -170,7 +166,7 @@
	@for file in $(DISTFILES); do \
	 d=$(srcdir); \
	 if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
	 else \
	 test -f $(distdir)/$$file \
	 || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-- 
Gordon Sadler
