This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: [patch] automake 1.8 support for gas
- From: Daniel Jacobowitz <drow at mvista dot com>
- To: "Maciej W. Rozycki" <macro at ds2 dot pg dot gda dot pl>
- Cc: binutils at sources dot redhat dot com
- Date: Mon, 22 Dec 2003 15:21:47 -0500
- Subject: Re: [patch] automake 1.8 support for gas
- References: <Pine.LNX.4.55.0312222053020.27594@jurand.ds.pg.gda.pl>
On Mon, Dec 22, 2003 at 09:07:47PM +0100, Maciej W. Rozycki wrote:
> Hello,
>
> As promised, now that automake has been fixed, I'm sending a fix for gas
> for a proper installation of info pages. Changes are essentially a
> reversion of a fix from Nov 12th, with the following additional changes:
>
> 1. "install-data-local" is used for installing the info pages -- using
> "install" for this purpose prevents the man page from being installed.
>
> 2. automake 1.8 or newer is required.
>
> 2003-12-22 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
>
> * Makefile.am (install, install-info, RECURSIVE_TARGETS): Remove.
> * Makefile.in: Regenerate.
> * aclocal.m4: Regenerate.
> * doc/Makefile.am (install, install-info): Remove.
> (install-data-local): A new hook for install-info.
> (AUTOMAKE_OPTIONS): Require automake 1.8.
> * doc/Makefile.in: Regenerate.
>
> This patch may require a clean-up of autoconf macro definitions I'm
> proposing in a separate mail.
>
> OK to apply?
I can't approve it but it looks OK to me. Shouldn't you add 1.8 to
gas/Makefile.am:AUTOMAKE_OPTIONS also?
Meanwhile, do you have any idea about the next of many automake
problems I've noticed: the rule which makes Makefile dependent on
bfd/configure.in (for the version number) now supresses rebuilding of
the Makefile. This is a documented change in autoconf 1.7/1.8. I
don't see any way to add a dependency to a default rule without
replacing it entirely.
>
> Maciej
>
> --
> + Maciej W. Rozycki, Technical University of Gdansk, Poland +
> +--------------------------------------------------------------+
> + e-mail: macro@ds2.pg.gda.pl, PGP key available +
>
> binutils-2.14.90-20031211-gas-info.patch
> diff -up --recursive --new-file binutils-2.14.90-20031211.macro/gas/Makefile.am binutils-2.14.90-20031211/gas/Makefile.am
> --- binutils-2.14.90-20031211.macro/gas/Makefile.am 2003-12-03 04:25:28.000000000 +0000
> +++ binutils-2.14.90-20031211/gas/Makefile.am 2003-12-21 22:34:16.000000000 +0000
> @@ -456,12 +456,6 @@ po/POTFILES.in: @MAINT@ Makefile
> for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
> && mv tmp $(srcdir)/po/POTFILES.in
>
> -# We want install to imply install-info as per GNU standards, despite the
> -# cygnus option.
> -install: install-recursive install-info
> -install-info: install-info-recursive
> -RECURSIVE_TARGETS += install-info-recursive
> -
> # Note: GASP is now deprecated and has been removed. It is still
> # available in the CVS archive or older binutils releases if it is needed.
> noinst_PROGRAMS = as-new
> diff -up --recursive --new-file binutils-2.14.90-20031211.macro/gas/doc/Makefile.am binutils-2.14.90-20031211/gas/doc/Makefile.am
> --- binutils-2.14.90-20031211.macro/gas/doc/Makefile.am 2003-11-13 04:25:22.000000000 +0000
> +++ binutils-2.14.90-20031211/gas/doc/Makefile.am 2003-12-22 00:51:27.000000000 +0000
> @@ -1,6 +1,6 @@
> ## Process this file with automake to generate Makefile.in
>
> -AUTOMAKE_OPTIONS = cygnus
> +AUTOMAKE_OPTIONS = 1.8 cygnus
>
> # What version of the manual you want; "all" includes everything
> CONFIG=all
> @@ -67,8 +67,7 @@ as.dvi: $(srcdir)/as.texinfo asconfig.te
>
> # We want install to imply install-info as per GNU standards, despite the
> # cygnus option.
> -install: install-info
> -install-info: install-info-am
> +install-data-local: install-info
>
> # This one isn't ready for prime time yet. Not even a little bit.
>
>
--
Daniel Jacobowitz
MontaVista Software Debian GNU/Linux Developer