From 38131e6744be32896c1259d5db95a1f492c11533 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 19 Sep 2001 17:02:38 +0000 Subject: [PATCH] 2000-09-19 H.J. Lu * doc/Makefile.am ($(DEMANGLER_NAME).1): Try cxxfilt.man and $(srcdir)/cxxfilt.man. * doc/Makefile.in: Rebuild. --- binutils/ChangeLog | 6 ++++++ binutils/doc/Makefile.am | 7 ++++++- binutils/doc/Makefile.in | 11 +++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 8039cc87f0e..15f90674184 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2000-09-19 H.J. Lu + + * doc/Makefile.am ($(DEMANGLER_NAME).1): Try cxxfilt.man and + $(srcdir)/cxxfilt.man. + * doc/Makefile.in: Rebuild. + 2001-09-19 Alan Modra * objcopy.c (copy_main): Correct rename-section string parsing. diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index b4a0d2aab60..8fc8c087ec6 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -146,8 +146,13 @@ DISTCLEANFILES = config.texi MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 $(DEMANGLER_NAME).1: cxxfilt.man Makefile + if test -f cxxfilt.man; then \ + man=cxxfilt.man; \ + else \ + man=$(srcdir)/cxxfilt.man; \ + fi; \ sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' \ - -e 's/cxxfilt/$(DEMANGLER_NAME)/' < cxxfilt.man \ + -e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \ > $(DEMANGLER_NAME).1 # Maintenance diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 6a62bb34b04..51fda7e7ec1 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -129,7 +129,9 @@ MANCONF = -Dman TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl -POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1 +POD2MAN = pod2man --center="GNU Development Tools" \ + --release="binutils-$(VERSION)" --section=1 + # List of man pages generated from binutils.texi man_MANS = \ @@ -536,8 +538,13 @@ cxxfilt.man: $(binutils_TEXI) rm -f $(DEMANGLER_NAME).pod $(DEMANGLER_NAME).1: cxxfilt.man Makefile + if test -f cxxfilt.man; then \ + man=cxxfilt.man; \ + else \ + man=$(srcdir)/cxxfilt.man; \ + fi; \ sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' \ - -e 's/cxxfilt/$(DEMANGLER_NAME)/' < cxxfilt.man \ + -e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \ > $(DEMANGLER_NAME).1 # Maintenance -- 2.30.2