From ceb979420919c42853ff956d1bd7fd1834bf45e5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 6 May 2001 05:39:58 +0000 Subject: [PATCH] * tests/Makefile.am (XFAIL_TESTS): Removed man.test. * mans.am (install-man%SECTION%): Handle dist_ and nodist_ prefixes. (uninstall-man%SECTION%): Likewise. * automake.in (handle_man_pages): Handle dist_ and nodist_ prefixes. --- ChangeLog | 7 +++++++ automake.in | 39 +++++++++++++++++++++++++-------------- lib/am/mans.am | 7 ++++--- mans.am | 7 ++++--- tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- 6 files changed, 42 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 714f7c3..9a6aceb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2001-05-05 Tom Tromey + * tests/Makefile.am (XFAIL_TESTS): Removed man.test. + * mans.am (install-man%SECTION%): Handle dist_ and nodist_ + prefixes. + (uninstall-man%SECTION%): Likewise. + * automake.in (handle_man_pages): Handle dist_ and nodist_ + prefixes. + * automake.texi (Future): Removed. (Depth): Removed. (Hello): Don't mention `deep'. diff --git a/automake.in b/automake.in index 6c857dd..f30157a 100755 --- a/automake.in +++ b/automake.in @@ -2838,26 +2838,37 @@ sub handle_man_pages # "standard" sections, and then looking for any additional # sections used in man_MANS. my (%sections, %vlist); - # Add more sections as needed. - foreach my $section ('0'..'9', 'n', 'l') + # We handle nodist_ for uniformity. man pages aren't distributed + # by default so it isn't actually very important. + foreach my $pfx ('', 'dist_', 'nodist_') { - if (&variable_defined ('man' . $section . '_MANS')) + # Add more sections as needed. + foreach my $section ('0'..'9', 'n', 'l') { - $sections{$section} = 1; - $vlist{'$(man' . $section . '_MANS)'} = 1; + if (&variable_defined ($pfx . 'man' . $section . '_MANS')) + { + $sections{$section} = 1; + $vlist{'$(' . $pfx . 'man' . $section . '_MANS)'} = 1; + + &push_dist_common ('$(' . $pfx . 'man' . $section . '_MANS)') + if $pfx eq 'dist_'; + } } - } - if (&variable_defined ('man_MANS')) - { - $vlist{'$(man_MANS)'} = 1; - foreach (&variable_value_as_list ('man_MANS', 'all')) + if (&variable_defined ($pfx . 'man_MANS')) { - # A page like `foo.1c' goes into man1dir. - if (/\.([0-9a-z])([a-z]*)$/) + $vlist{'$(' . $pfx . 'man_MANS)'} = 1; + foreach (&variable_value_as_list ($pfx . 'man_MANS', 'all')) { - $sections{$1} = 1; + # A page like `foo.1c' goes into man1dir. + if (/\.([0-9a-z])([a-z]*)$/) + { + $sections{$1} = 1; + } } + + &push_dist_common ('$(' . $pfx . 'man_MANS)') + if $pfx eq 'dist_'; } } @@ -2867,7 +2878,7 @@ sub handle_man_pages # Sort sections so output is deterministic. foreach my $section (sort keys %sections) { - $output_rules .= &file_contents ('mans', ('SECTION', $section)); + $output_rules .= &file_contents ('mans', ('SECTION' => $section)); } $output_vars .= &file_contents ('mans-vars', diff --git a/lib/am/mans.am b/lib/am/mans.am index 2566953..dfc3fbb 100644 --- a/lib/am/mans.am +++ b/lib/am/mans.am @@ -32,10 +32,10 @@ man%SECTION%dir = $(mandir)/man%SECTION% install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(man%SECTION%dir) - @list='$(man%SECTION%_MANS)'; \ + @list='$(man%SECTION%_MANS) $(dist_man%SECTION%_MANS) $(nodist_man%SECTION%_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. - l2='$(man_MANS)'; for i in $$l2; do \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do \ case "$$i" in \ ## Have to accept files like `foo.1c'. *.%SECTION%*) list="$$list $$i" ;; \ @@ -67,9 +67,10 @@ install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS) uninstall-man%SECTION%: @$(NORMAL_UNINSTALL) @list='$(man%SECTION%_MANS)'; \ + @list='$(man%SECTION%_MANS) $(dist_man%SECTION%_MANS) $(nodist_man%SECTION%_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. - l2='$(man_MANS)'; for i in $$l2; do \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do \ case "$$i" in \ ## Have to accept files like `foo.1c'. *.%SECTION%*) list="$$list $$i" ;; \ diff --git a/mans.am b/mans.am index 2566953..dfc3fbb 100644 --- a/mans.am +++ b/mans.am @@ -32,10 +32,10 @@ man%SECTION%dir = $(mandir)/man%SECTION% install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(man%SECTION%dir) - @list='$(man%SECTION%_MANS)'; \ + @list='$(man%SECTION%_MANS) $(dist_man%SECTION%_MANS) $(nodist_man%SECTION%_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. - l2='$(man_MANS)'; for i in $$l2; do \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do \ case "$$i" in \ ## Have to accept files like `foo.1c'. *.%SECTION%*) list="$$list $$i" ;; \ @@ -67,9 +67,10 @@ install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS) uninstall-man%SECTION%: @$(NORMAL_UNINSTALL) @list='$(man%SECTION%_MANS)'; \ + @list='$(man%SECTION%_MANS) $(dist_man%SECTION%_MANS) $(nodist_man%SECTION%_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. - l2='$(man_MANS)'; for i in $$l2; do \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do \ case "$$i" in \ ## Have to accept files like `foo.1c'. *.%SECTION%*) list="$$list $$i" ;; \ diff --git a/tests/Makefile.am b/tests/Makefile.am index e07bb33..1aa5948 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test +XFAIL_TESTS = objc.test subobj2.test yaccvpath.test TESTS = \ acinclude.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 225c7c6..2da55d0 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -75,7 +75,7 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test +XFAIL_TESTS = objc.test subobj2.test yaccvpath.test TESTS = \ acinclude.test \ -- 2.7.4