This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: build error in binutils/doc/
On Sun, Sep 16, 2001 at 09:08:45AM -0700, H . J . Lu wrote:
> On Sun, Sep 16, 2001 at 05:47:36PM +0200, Bruno Haible wrote:
> > Hi,
> >
> > This patch fixes a build error when building the CVS snapshot with
> > builddir != srcdir. cxxfilt.man is in $(srcdir).
> >
> >
> > 2001-09-15 Bruno Haible <haible@clisp.cons.org>
> >
> > * doc/Makefile.am (c++filt.1): Use $(srcdir)/cxxfilt.man, not
> > cxxfilt.man.
> >
>
> I don't think it is right since cxxfilt.man is a generated file.
> Unfortunately, we cannot assume gnu make. Something is wrong with
> the CVS snapshot. I didn't see it since I don't use the CVS snapshot.
> This patch should remove cxxfilt.man from the CVS snapshot.
>
>
Here is a better patch. I will check it in as an obvious fix.
H.J.
-----
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.
--- doc/Makefile.am.build Wed Aug 1 08:54:41 2001
+++ doc/Makefile.am Wed Sep 19 09:34:35 2001
@@ -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
--- doc/Makefile.in.build Tue Jul 3 09:35:34 2001
+++ doc/Makefile.in Wed Sep 19 09:37:56 2001
@@ -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