This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: fastjar.info not installed any longer?
- From: Kelley Cook <kelleycook at wideopenwest dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Sun, 30 Nov 2003 22:00:25 -0500
- Subject: Re: fastjar.info not installed any longer?
- References: <3FCA95F0.3050900@specifixinc.com>
Jim Wilson wrote:
> OK. Plus you will need the gcc/doc/install.texi change Joseph Myers
> asked for.
>
> This was accidentally not sent to the gcc-patches list. Looks like
> maybe the cc line got a little confused.
Reposted to gcc-patches with changes. Committed.
Kelley Cook
fastjar/
2003-12-01 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.am: Define AM_MAKINFOFLAGS. Remove Automake 1.4 hack.
* Makefile.in: Regenerate with automake 1.7.6 & autoconf 2.57 tools.
* aclocal.m4, config.h.in, configure: Likewise.
* install-sh, missing, mkinstalldirs, stamp-h.in: Remove.
--- fastjar/Makefile.am 3 Nov 2003 13:21:00 -0000 1.13
+++ fastjar/Makefile.am 1 Dec 2003 02:49:39 -0000
@@ -57,6 +57,7 @@ grepjar_LDADD = $(ZLIBS) $(LIBIBERTY)
grepjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
AM_CFLAGS = @fastjar_warn_cflags@
+AM_MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
info_TEXINFOS = fastjar.texi
@@ -65,16 +66,6 @@ fastjar_TEXINFOS = \
../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.
-my_makei_flags += -I $(srcdir)/../gcc/doc/include
-fastjar.info: fastjar.texi $(fastjar_TEXINFOS)
- rm -f $@ $@-[0-9] $@-[0-9][0-9]
- $(MAKEINFO) $(my_makei_flags) -o $@ $<
TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
gcc/
2003-12-01 Kelley Cook <kcook@gcc.gnu.org>
* doc/install.texi: Note that fastjar is built with automake 1.7.x
and autoconf 2.57.
--- gcc/doc/install.texi 27 Nov 2003 18:04:14 -0000 1.237
+++ gcc/doc/install.texi 1 Dec 2003 02:49:47 -0000
@@ -292,14 +292,15 @@ systems' @command{tar} programs will als
Necessary when modifying @file{configure.in}, @file{aclocal.m4}, etc.@:
to regenerate @file{configure} and @file{config.in} files. Most
-directories require autoconf 2.13 (exactly), but @file{libiberty} and
-@file{libstdc++-v3} require autoconf 2.57 (exactly).
+directories require autoconf 2.13 (exactly), but @file{libiberty},
+@file{fastjar}, and @file{libstdc++-v3} require autoconf 2.57 (exactly).
@item automake versions 1.4-p? and 1.7.?
Necessary when modifying a @file{Makefile.am} file to regenerate its
associated @file{Makefile.in}. Most directories require a 1.4 series
-automake; @file{libstdc++-v3} requires a 1.7 series automake.
+automake; @file{libstdc++-v3} and @file{fastjar} requires a 1.7 series
+automake.
@item gettext version 0.12 (or later)