cleanups to handle VPATH builds better; passifies make distcheck

diff --git a/tests/test-extended/Makefile.am b/tests/test-extended/Makefile.am
index 7ad79667a1dafc860328e2c6841cb6c8695e388c..92841f05336191b7e634058e7e56c079e9028094 100644 (file)
--- a/tests/test-extended/Makefile.am
+++ b/tests/test-extended/Makefile.am
@@ -38,7 +38,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
-       ./$(testname)$(EXEEXT) < $(srcdir)/test.input | diff -q test.input -
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input | diff -q $(srcdir)/test.input -
 
 .c.o:
        $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-quotes/Makefile.am b/tests/test-quotes/Makefile.am
index 77bfe6f769c28ed78759778c2c586d66d8c98556..f726b7e5b569c03ddd4f216b3ef68add2160c5f6 100644 (file)
--- a/tests/test-quotes/Makefile.am
+++ b/tests/test-quotes/Makefile.am
@@ -24,7 +24,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
+CLEANFILES = l.out c.out  scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir)
@@ -38,7 +38,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
-       grep TEST_XXX < scanner.l | sed 's/^ *//' > l.out
+       grep TEST_XXX < $(srcdir)/scanner.l | sed 's/^ *//' > l.out
        grep TEST_XXX < scanner.c | sed 's/^ *//' > c.out
        diff -q l.out c.out
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input