* fastjar.info not installed any longer?
@ 2003-11-27 16:04 Gerald Pfeifer
2003-11-27 17:57 ` Gunther Nikl
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Gerald Pfeifer @ 2003-11-27 16:04 UTC (permalink / raw)
To: Kelley Cook, gcc
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?
Gerald
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: fastjar.info not installed any longer?
2003-11-27 16:04 fastjar.info not installed any longer? Gerald Pfeifer
@ 2003-11-27 17:57 ` Gunther Nikl
2003-11-30 1:22 ` [Committed] Install gccinstall.info (was fastjar.info not installed any longer?) Kelley Cook
2003-11-29 4:06 ` fastjar.info not installed any longer? Jim Wilson
2003-12-01 0:30 ` Kelley Cook
2 siblings, 1 reply; 8+ messages in thread
From: Gunther Nikl @ 2003-11-27 17:57 UTC (permalink / raw)
To: Gerald Pfeifer; +Cc: Kelley Cook, gcc
On Thu, Nov 27, 2003 at 10:45:48AM +0100, Gerald Pfeifer wrote:
> 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.
The same is true for gccinstall.info.
Gunther
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: fastjar.info not installed any longer?
2003-11-27 16:04 fastjar.info not installed any longer? Gerald Pfeifer
2003-11-27 17:57 ` Gunther Nikl
@ 2003-11-29 4:06 ` Jim Wilson
2003-12-01 0:30 ` Kelley Cook
2 siblings, 0 replies; 8+ messages in thread
From: Jim Wilson @ 2003-11-29 4:06 UTC (permalink / raw)
To: Gerald Pfeifer; +Cc: gcc
Gerald Pfeifer wrote:
> 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.
I would guess that this is an unintentional side-effect of the patches
for PR 10996. A quick check of the fastjar Makefile seems to confirm
this. The install rule is broken now, as it looks in the wrong directory.
--
Jim Wilson, GNU Tools Support, http://www.SpecifixInc.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Committed] Install gccinstall.info (was fastjar.info not installed any longer?)
2003-11-27 17:57 ` Gunther Nikl
@ 2003-11-30 1:22 ` Kelley Cook
0 siblings, 0 replies; 8+ messages in thread
From: Kelley Cook @ 2003-11-30 1:22 UTC (permalink / raw)
To: Gerald Pfeifer, Gunther Nikl; +Cc: GCC Mailing List, GCC Patches, Kelley Cook
On Thu, 27 Nov 2003 11:35:10 +0100, Gunther Nikl wrote:
>On Thu, Nov 27, 2003 at 10:45:48AM +0100, Gerald Pfeifer wrote:
>> 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.
> The same is true for gccinstall.info.
The gccinstall.info portion is fixed with a one-liner.
i686-pc-cygwin:
make bootstrap
make install
Committed under the obvious rule.
Kelley Cook
2003-11-29 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.in (install-info): Install gccinstall.info too.
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1201
diff -u -p -r1.1201 Makefile.in
--- Makefile.in 26 Nov 2003 19:04:18 -0000 1.1201
+++ Makefile.in 30 Nov 2003 01:01:56 -0000
@@ -2980,6 +2980,7 @@ install-info:: doc installdirs \
$(DESTDIR)$(infodir)/cpp.info \
$(DESTDIR)$(infodir)/gcc.info \
$(DESTDIR)$(infodir)/cppinternals.info \
+ $(DESTDIR)$(infodir)/gccinstall.info \
$(DESTDIR)$(infodir)/gccint.info
$(DESTDIR)$(infodir)/%.info: $(docobjdir)/%.info installdirs
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: fastjar.info not installed any longer?
2003-11-27 16:04 fastjar.info not installed any longer? Gerald Pfeifer
2003-11-27 17:57 ` Gunther Nikl
2003-11-29 4:06 ` fastjar.info not installed any longer? Jim Wilson
@ 2003-12-01 0:30 ` Kelley Cook
2003-12-01 0:47 ` Kelley Cook
` (2 more replies)
2 siblings, 3 replies; 8+ messages in thread
From: Kelley Cook @ 2003-12-01 0:30 UTC (permalink / raw)
To: Gerald Pfeifer; +Cc: GCC Patches, GCC, java-patches, Bryan Burns
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
> 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
[-- Attachment #2: fastjar_1.7.patch --]
[-- Type: text/plain, Size: 1552 bytes --]
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@"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: fastjar.info not installed any longer?
2003-12-01 0:30 ` Kelley Cook
@ 2003-12-01 0:47 ` Kelley Cook
2003-12-01 1:14 ` Jim Wilson
2003-12-01 1:14 ` Joseph S. Myers
2 siblings, 0 replies; 8+ messages in thread
From: Kelley Cook @ 2003-12-01 0:47 UTC (permalink / raw)
To: Gerald Pfeifer; +Cc: GCC Patches, GCC, java-patches, Bryan Burns
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
> 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
[-- Attachment #2: fastjar_1.7.patch --]
[-- Type: text/plain, Size: 1552 bytes --]
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@"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: fastjar.info not installed any longer?
2003-12-01 0:30 ` Kelley Cook
2003-12-01 0:47 ` Kelley Cook
@ 2003-12-01 1:14 ` Jim Wilson
2003-12-01 1:14 ` Joseph S. Myers
2 siblings, 0 replies; 8+ messages in thread
From: Jim Wilson @ 2003-12-01 1:14 UTC (permalink / raw)
To: Kelley Cook; +Cc: gcc, java-patches, Bryan Burns
Kelley Cook wrote:
> * 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.
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.
--
Jim Wilson, GNU Tools Support, http://www.SpecifixInc.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: fastjar.info not installed any longer?
2003-12-01 0:30 ` Kelley Cook
2003-12-01 0:47 ` Kelley Cook
2003-12-01 1:14 ` Jim Wilson
@ 2003-12-01 1:14 ` Joseph S. Myers
2 siblings, 0 replies; 8+ messages in thread
From: Joseph S. Myers @ 2003-12-01 1:14 UTC (permalink / raw)
To: Kelley Cook; +Cc: Gerald Pfeifer, GCC Patches, java-patches, Bryan Burns
On Sun, 30 Nov 2003, Kelley Cook wrote:
> 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.
Please be sure to update the details in install.texi of which directories
use which autoconf and automake versions when converting directories to
newer autoconf and automake.
--
Joseph S. Myers
jsm@polyomino.org.uk
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2003-12-01 1:14 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-11-27 16:04 fastjar.info not installed any longer? Gerald Pfeifer
2003-11-27 17:57 ` Gunther Nikl
2003-11-30 1:22 ` [Committed] Install gccinstall.info (was fastjar.info not installed any longer?) Kelley Cook
2003-11-29 4:06 ` fastjar.info not installed any longer? Jim Wilson
2003-12-01 0:30 ` Kelley Cook
2003-12-01 0:47 ` Kelley Cook
2003-12-01 1:14 ` Jim Wilson
2003-12-01 1:14 ` Joseph S. Myers
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).