* build error in binutils/doc/
@ 2001-09-16 8:46 Bruno Haible
2001-09-16 9:08 ` H . J . Lu
0 siblings, 1 reply; 3+ messages in thread
From: Bruno Haible @ 2001-09-16 8:46 UTC (permalink / raw)
To: binutils
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.
diff -r -c3 --exclude=ldlex.c --exclude=m68k-parse.c --exclude=nlmheader.c --exclude=rclex.c --exclude=rcparse.c binutils-010912.orig/binutils/doc/Makefile.am binutils-010912/binutils/doc/Makefile.am
*** binutils-010912.orig/binutils/doc/Makefile.am Wed Aug 1 17:54:41 2001
--- binutils-010912/binutils/doc/Makefile.am Sat Sep 15 19:58:34 2001
***************
*** 147,153 ****
$(DEMANGLER_NAME).1: cxxfilt.man Makefile
sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' \
! -e 's/cxxfilt/$(DEMANGLER_NAME)/' < cxxfilt.man \
> $(DEMANGLER_NAME).1
# Maintenance
--- 147,153 ----
$(DEMANGLER_NAME).1: cxxfilt.man Makefile
sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' \
! -e 's/cxxfilt/$(DEMANGLER_NAME)/' < $(srcdir)/cxxfilt.man \
> $(DEMANGLER_NAME).1
# Maintenance
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: build error in binutils/doc/
2001-09-16 8:46 build error in binutils/doc/ Bruno Haible
@ 2001-09-16 9:08 ` H . J . Lu
2001-09-19 9:50 ` H . J . Lu
0 siblings, 1 reply; 3+ messages in thread
From: H . J . Lu @ 2001-09-16 9:08 UTC (permalink / raw)
To: Bruno Haible; +Cc: binutils
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.
H.J.
-----
2000-09-16 H.J. Lu <hjl@gnu.org>
* doc/Makefile.am (MOSTLYCLEANFILES): Add cxxfilt.man.
* doc/Makefile.in: Rebuild.
Index: doc/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/binutils/doc/Makefile.am,v
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.3 Makefile.am
--- doc/Makefile.am 2001/08/03 15:37:23 1.1.1.3
+++ doc/Makefile.am 2001/09/16 16:05:13
@@ -143,7 +143,7 @@ cxxfilt.man: $(binutils_TEXI)
MAINTAINERCLEANFILES = config.texi
DISTCLEANFILES = config.texi
-MOSTLYCLEANFILES = $(DEMANGLER_NAME).1
+MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 cxxfilt.man
$(DEMANGLER_NAME).1: cxxfilt.man Makefile
sed -e 's/@PROGRAM@/$(DEMANGLER_NAME)/' \
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: build error in binutils/doc/
2001-09-16 9:08 ` H . J . Lu
@ 2001-09-19 9:50 ` H . J . Lu
0 siblings, 0 replies; 3+ messages in thread
From: H . J . Lu @ 2001-09-19 9:50 UTC (permalink / raw)
To: Bruno Haible; +Cc: binutils
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2001-09-19 9:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2001-09-16 8:46 build error in binutils/doc/ Bruno Haible
2001-09-16 9:08 ` H . J . Lu
2001-09-19 9:50 ` H . J . Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).