* tests/Makefile.am (TESTS): Added dejagnu2.test.

	* tests/dejagnu2.test: New file.
	* lib/am/dejagnu.am (site.exp): Don't conditionalize.
	* automake.in (handle_scripts): Removed dead code.
	(handle_tests_dejagnu): Don't handle site.exp generation
	specially.

diff --git a/ChangeLog b/ChangeLog
index d9a9c95..64049ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-05  Tom Tromey  <tromey@redhat.com>
+
+       * tests/Makefile.am (TESTS): Added dejagnu2.test.
+       * tests/dejagnu2.test: New file.
+       * lib/am/dejagnu.am (site.exp): Don't conditionalize.
+       * automake.in (handle_scripts): Removed dead code.
+       (handle_tests_dejagnu): Don't handle site.exp generation
+       specially.
+
 2001-08-04  Richard Boulton <richard@tartarus.org>
 
        * tests/cond17.test: New file: test for being able to define an

diff --git a/automake.in b/automake.in
index ab50ebd..dde18f5 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2770,24 +2770,6 @@ sub handle_scripts
     &am_install_var ('-candist', 'scripts', 'SCRIPTS',
                     'bin', 'sbin', 'libexec', 'pkgdata',
                     'noinst', 'check');
-
-    my $scripts_installed = 0;
-    # Set $scripts_installed if appropriate.  Make sure we only find
-    # scripts which are actually installed -- this is why we can't
-    # simply use the return value of am_install_var.
-    my %valid = &am_primary_prefixes ('SCRIPTS', 1, 'bin', 'sbin',
-                                     'libexec', 'pkgdata',
-                                     'noinst', 'check');
-    foreach my $key (keys %valid)
-    {
-       if ($key ne 'noinst'
-           && $key ne 'check'
-           && &variable_defined ($key . '_SCRIPTS'))
-       {
-           $scripts_installed = 1;
-           # push (@check_tests, 'check-' . $key . 'SCRIPTS');
-       }
-    }
 }
 
 
@@ -4158,10 +4140,7 @@ sub handle_factored_dependencies
 sub handle_tests_dejagnu
 {
     push (@check_tests, 'check-DEJAGNU');
-
-    # Only create site.exp rule if user hasn't already written one.
-    $output_rules .=
-      file_contents ('dejagnu', ('SITE-EXP' => ! target_defined ('site.exp')));
+    $output_rules .= file_contents ('dejagnu');
 }
 
 

diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index e248867..0c78ab4 100644 (file)
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -74,7 +74,6 @@ check-DEJAGNU: site.exp
 ## Note that in the rule we don't directly generate site.exp to avoid
 ## the possibility of a corrupted site.exp if make is interrupted.
 ## Jim Meyering has some useful text on this topic.
-if %?SITE-EXP%
 site.exp: Makefile
        @echo 'Making a new site.exp file...'
        @echo '## these variables are automatically generated by make ##' >site.tmp
@@ -95,4 +94,3 @@ site.exp: Makefile
        @-rm -f site.bak
        @test ! -f site.exp || mv site.exp site.bak
        @mv site.tmp site.exp
-endif %?SITE-EXP%

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e4468a5..42234dd 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -100,6 +100,7 @@ dash.test \
 defun.test \
 defun2.test \
 dejagnu.test \
+dejagnu2.test \
 depacl.test \
 depacl2.test \
 depcomp.test \

diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test
new file mode 100755 (executable)
index 0000000..f99163a
--- /dev/null
+++ b/tests/dejagnu2.test
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+# Make sure we don't override the user's site.exp rule.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+
+site.exp:
+    echo foo
+END
+
+$AUTOMAKE || exit 1
+
+grep site.exp Makefile.in
+test `grep '^site\.exp:' Makefile.in | wc -l` -eq 1