From c1960bbbd2dc7f674a212e135544db9d1d8d85ae Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 27 Mar 1999 12:23:47 +0000 Subject: [PATCH] * automake.in (saw_sources_p): Correctly count header extensions seen. (handle_headers): Fixed order of arguments to am_install_var. * automake.in (am_install_var): Don't error if EXTRA_foo is defined uselessly. --- ChangeLog | 7 +++++++ automake.in | 13 +++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81e73f56..cedf2a6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 1999-03-27 Tom Tromey + * automake.in (saw_sources_p): Correctly count header extensions + seen. + (handle_headers): Fixed order of arguments to am_install_var. + + * automake.in (am_install_var): Don't error if EXTRA_foo is + defined uselessly. + * scripts.am (install-@DIR@SCRIPTS): Use NDIR when appropriate. (uninstall-@DIR@SCRIPTS): Likewise. * progs.am (install-@DIR@PROGRAMS): Use NDIR when appropriate. diff --git a/automake.in b/automake.in index 0fb8edfa..5c07046a 100755 --- a/automake.in +++ b/automake.in @@ -3251,7 +3251,7 @@ sub handle_configure sub handle_headers { local (@r); - @r = &am_install_var ('header', '-defaultdist', 'HEADERS', 'include', + @r = &am_install_var ('-defaultdist', 'header', 'HEADERS', 'include', 'oldinclude', 'pkginclude', 'noinst', 'check'); foreach (@r) @@ -4988,7 +4988,8 @@ sub saw_sources_p } else { - $headers = defined $extension_seen{'header'}; + local (@exts) = &lang_extensions ('header'); + $headers = @exts; } return scalar keys %extension_seen > $headers; @@ -6788,12 +6789,8 @@ sub am_install_var # all, or install targets. if ($X eq 'EXTRA') { - if (! $warned_about_extra && ! $do_require) - { - $warned_about_extra = 1; - &am_line_error ($one_name, - "\`$one_name' should not be defined"); - } + # We used to warn if EXTRA_FOO was defined uselessly, + # but this was annoying. next; } -- 2.43.5