test harness: improve catching of usage errors in script 'test-driver'

[platform/upstream/automake.git] / t / subpkg-yacc.sh

diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh
old mode 100755 (executable)
new mode 100644 (file)
index f1b2ac3..9fc6761
--- a/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 # properly, when a subpackage is involved.
 
 required='cc yacc'
-. ./defs || Exit 1
+. test-init.sh
 
 cat >>configure.ac <<'END'
 AC_PROG_CC
@@ -49,7 +49,7 @@ mkdir lib/src
 
 cat >lib/configure.ac <<'EOF'
 AC_INIT([lib], [2.3])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
 AC_PROG_RANLIB
 AC_PROG_YACC
 dnl This comes after YACC and RANLIB checks, deliberately.
@@ -120,7 +120,7 @@ cd ..
 $MAKE dist
 test -f lib-dist-hook-has-run
 test -f subpack-1.tar.gz
-test ! -d subpack-1 # Make sure "dist" cleans up after itself.
+test ! -e subpack-1 # Make sure "dist" cleans up after itself.
 
 rm -f lib-dist-hook-has-run subpack-1.tar.gz