2001-05-05 Tom Tromey <tromey@redhat.com>
+ * 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'.
# "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_';
}
}
# 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',
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" ;; \
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" ;; \
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" ;; \
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" ;; \
AUTOMAKE_OPTIONS = gnits
-XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test
+XFAIL_TESTS = objc.test subobj2.test yaccvpath.test
TESTS = \
acinclude.test \
AUTOMAKE_OPTIONS = gnits
-XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test
+XFAIL_TESTS = objc.test subobj2.test yaccvpath.test
TESTS = \
acinclude.test \