This is the mail archive of the
gcc@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: Gerald Pfeifer <gp at suse dot de>
- Cc: GCC Patches <gcc at gcc dot gnu dot org>, GCC at gnu dot org, java-patches at gcc dot gnu dot org, Bryan Burns <bryan at evilscheme dot org>
- Date: Sun, 30 Nov 2003 19:30:51 -0500
- Subject: Re: fastjar.info not installed any longer?
- References: <Pine.LNX.4.58.0311271041180.1319@D209.suse.de>
> On current mainline (with --enable-languages=c,c++,objc,java)
fastjar.info
> is not installed any longer, even though it is created in the object
tree.
>
> This is a change from 3.3, and given that we create that file, shouldn't
> we also install it?
Initially I just regened Makefile.in with automake-1.4 --cygnus which
will install the info file properly, but then make all would not
generate the info file.
So I was about to modify the makeinfo hack to do just that, when I read
that the hack existed solely because we were using automake 1.4. Since
some portions of GCC already require automake 1.7, I followed the
comment's suggestions by defining AM_MAKEINFOFLAGS, deleting the hack
and regen-ing with automake 1.7.6 and autoconf 2.57.
Whilst I was there I deleted four superfluous files since we do have a
toplevel (this hunk would not apply to the fastjar mainline, if it is
still active)
Bootstrapped and regtested i686-pc-cygwin.
make install now works as expected.
OK to install?
Kelley Cook
2003-11-30 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.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/fastjar/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- Makefile.am 3 Nov 2003 13:21:00 -0000 1.13
+++ Makefile.am 1 Dec 2003 00:15:11 -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@"