This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: gcc CVS breakage
>>>>> "Matthias" == Matthias Klose <doko@cs.tu-berlin.de> writes:
Matthias> yes, but it's not autogenerated by automake, as fastjar
Matthias> does. The only thing that would work is to duplicate the
Matthias> rules for dvi and info generation, which is ugly as well.
It is ugly but, I think, ok. It is upgrade-proof, for one thing. And
I documented the problem and how to fix it if/when we upgrade auto*.
I'm checking in the appended.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (TEXINFO_TEX): New macro.
(info_TEXINFOS): Likewise.
(fastjar_TEXINFOS): Likewise.
(man_MANS): Likewise.
(EXTRA_DIST): Likewise.
(my_makei_flags): Likewise.
(fastjar.info): New rule.
(fastjar_TEXINFOS): Don't mention `$(srcdir)'.
(TEXINFO_TEX): Likewise.
(AUTOMAKE_OPTIONS): Added `cygnus'.
Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ .cvsignore 11 Sep 2002 23:04:40 -0000
@@ -0,0 +1,3 @@
+fastjar.info
+grepjar.1
+jar.1
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/fastjar/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- Makefile.am 11 Sep 2002 05:49:48 -0000 1.9
+++ Makefile.am 11 Sep 2002 23:04:40 -0000
@@ -58,6 +58,28 @@
AM_CFLAGS = @fastjar_warn_cflags@
+TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
+info_TEXINFOS = fastjar.texi
+fastjar_TEXINFOS = \
+ ../gcc/doc/include/gcc-common.texi \
+ ../gcc/doc/include/fdl.texi \
+ ../gcc/doc/include/gpl.texi
+man_MANS = jar.1 grepjar.1
+EXTRA_DIST = $(man_MANS)
+
+## This is a hack. We can't set AM_MAKEINFOFLAGS, since that isn't
+## available in 1.4. Nor can we override or append to MAKEINFO or
+## MAKEINFOFLAGS, since these are overridden by the top-level
+## Makefile. So, we just duplicate the rules. FIXME: remove this
+## when we upgrade automake. Note that we don't include $(srcdir) in
+## my_makei_flags; makeinfo is run in srcdir.
+my_makei_flags += -I ../gcc/doc/include
+fastjar.info: fastjar.texi $(fastjar_TEXINFOS)
+ @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ cd $(srcdir) \
+ && $(MAKEINFO) $(my_makei_flags) `echo $< | sed 's,.*/,,'`
+
+
TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"