aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2001-09-19 17:02:38 +0000
committerH.J. Lu <hjl.tools@gmail.com>2001-09-19 17:02:38 +0000
commit38131e6744be32896c1259d5db95a1f492c11533 (patch)
treea31da9e6bc6fce5ac188379e2307b229e981f4a4
parent2015650dea6c2c983cae3732b9f3a3590746c880 (diff)
downloadfsf-binutils-gdb-38131e6744be32896c1259d5db95a1f492c11533.zip
fsf-binutils-gdb-38131e6744be32896c1259d5db95a1f492c11533.tar.gz
fsf-binutils-gdb-38131e6744be32896c1259d5db95a1f492c11533.tar.bz2
2000-09-19 H.J. Lu <hjl@gnu.org>
* doc/Makefile.am ($(DEMANGLER_NAME).1): Try cxxfilt.man and $(srcdir)/cxxfilt.man. * doc/Makefile.in: Rebuild.
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/doc/Makefile.am7
-rw-r--r--binutils/doc/Makefile.in11
3 files changed, 21 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8039cc8..15f9067 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-19 H.J. Lu <hjl@gnu.org>
+
+ * doc/Makefile.am ($(DEMANGLER_NAME).1): Try cxxfilt.man and
+ $(srcdir)/cxxfilt.man.
+ * doc/Makefile.in: Rebuild.
+
2001-09-19 Alan Modra <amodra@bigpond.net.au>
* objcopy.c (copy_main): Correct rename-section string parsing.
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index b4a0d2a..8fc8c08 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 6a62bb3..51fda7e 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