[COMMITTED PATCH] Fix missing build dependency for binutils man pages

Roland McGrath mcgrathr@google.com
Tue Nov 30 18:21:16 GMT 2021


As was already noted, the recent binutils/doc makefile refactor broke
some cases when the build_dir/binutils/doc subdirectory didn't already
exist.
This fixes it in the obvious way.  Committed as obvious enough.

Thanks,
Roland

binutils/
2021-11-30  Roland McGrath  <mcgrathr@google.com>

        * doc/local.mk: Give each man page target its missing
dependency on
        doc/$(am__dirstamp).

diff --git a/binutils/doc/local.mk b/binutils/doc/local.mk
index 687b3f65e6c..c4980963f4b 100644
--- a/binutils/doc/local.mk
+++ b/binutils/doc/local.mk
@@ -56,105 +56,105 @@ TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I
"$(top_srcdir)/../libiberty" \
                    -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc

 # Man page generation from texinfo
-%D%/addr2line.1:       $(binutils_TEXI)
+%D%/addr2line.1:       $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Daddr2line <
$(binutils_TEXI) > addr2line.pod
        $(AM_V_at)-($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d'
> $@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f addr2line.pod

-%D%/ar.1:      $(binutils_TEXI)
+%D%/ar.1:      $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dar < $(binutils_TEXI) >
ar.pod
        $(AM_V_at)-($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f ar.pod

-%D%/dlltool.1: $(binutils_TEXI)
+%D%/dlltool.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Ddlltool < $(binutils_TEXI)
> dlltool.pod
        $(AM_V_at)-($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f dlltool.pod

-%D%/nm.1:      $(binutils_TEXI)
+%D%/nm.1:      $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) >
nm.pod
        $(AM_V_at)-($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f nm.pod

-%D%/objcopy.1: $(binutils_TEXI)
+%D%/objcopy.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dobjcopy < $(binutils_TEXI)
> objcopy.pod
        $(AM_V_at)-($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f objcopy.pod

-%D%/objdump.1: $(binutils_TEXI)
+%D%/objdump.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dobjdump < $(binutils_TEXI)
> objdump.pod
        $(AM_V_at)-($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f objdump.pod

-%D%/ranlib.1:  $(binutils_TEXI)
+%D%/ranlib.1:  $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dranlib < $(binutils_TEXI)
> ranlib.pod
        $(AM_V_at)-($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f ranlib.pod

-%D%/readelf.1: $(binutils_TEXI)
+%D%/readelf.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dreadelf < $(binutils_TEXI)
> readelf.pod
        $(AM_V_at)-($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f readelf.pod

-%D%/size.1:    $(binutils_TEXI)
+%D%/size.1:    $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dsize < $(binutils_TEXI) >
size.pod
        $(AM_V_at)-($(POD2MAN) size.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f size.pod

-%D%/strings.1: $(binutils_TEXI)
+%D%/strings.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dstrings < $(binutils_TEXI)
> strings.pod
        $(AM_V_at)-($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f strings.pod

-%D%/strip.1:   $(binutils_TEXI)
+%D%/strip.1:   $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dstrip < $(binutils_TEXI) >
strip.pod
        $(AM_V_at)-($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f strip.pod

-%D%/elfedit.1: $(binutils_TEXI)
+%D%/elfedit.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Delfedit < $(binutils_TEXI)
> elfedit.pod
        $(AM_V_at)-($(POD2MAN) elfedit.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f elfedit.pod

-%D%/windres.1: $(binutils_TEXI)
+%D%/windres.1: $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dwindres < $(binutils_TEXI)
> windres.pod
        $(AM_V_at)-($(POD2MAN) windres.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f windres.pod

-%D%/windmc.1:  $(binutils_TEXI)
+%D%/windmc.1:  $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dwindmc < $(binutils_TEXI)
> windmc.pod
        $(AM_V_at)-($(POD2MAN) windmc.pod | sed -e '/^.if n .na/d' >
$@.T$$$$ && \
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        $(AM_V_at)rm -f windmc.pod

-%D%/cxxfilt.man:       $(binutils_TEXI)
+%D%/cxxfilt.man:       $(binutils_TEXI) doc/$(am__dirstamp)
        $(AM_V_GEN)touch $@
        $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dcxxfilt < $(binutils_TEXI)
> $(DEMANGLER_NAME).pod
        $(AM_V_at)-($(POD2MAN) $(DEMANGLER_NAME).pod | sed -e '/^.if n
.na/d' > $@.T$$$$ && \
@@ -163,7 +163,7 @@ TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I
"$(top_srcdir)/../libiberty" \
 MAINTAINERCLEANFILES += $(man_MANS) %D%/binutils.info %D%/cxxfilt.man

-%D%/$(DEMANGLER_NAME).1: %D%/cxxfilt.man Makefile
+%D%/$(DEMANGLER_NAME).1: %D%/cxxfilt.man Makefile doc/$(am__dirstamp)
        $(AM_V_GEN)if test -f %D%/cxxfilt.man; then \
          man=%D%/cxxfilt.man; \
        else \


More information about the Binutils mailing list