Re: gcc/ada/Make-lang.in: Some install tuning

[Christian Cornelssen <ccorn at cs dot tu-berlin dot de>]

Hello,

On 28 Jan 2003, Alexandre Oliva wrote:

> I just put it in in 3.2 and 3.3.

I have compared the check-in with my version.  The erroneous
and redundant gnatchop installation commands have been left in.
That is uncritical, but the ChangeLog entry in `gcc/ada/ChangeLog'
tells about those deletions.  This is an inconsistency.

Indeed, there are three related check-ins to the 3.2 branch:

1.7.10.1.4.1	apparently by destdir-3.2-2.diff
1.7.10.1.4.2	the two deletions from the 3.3/3.4 gcc-ada patch,
		reversed ?!
1.7.10.1.4.3	most parts of gcc-ada-Make-lang.in-3.2-2.diff,
		still with the DESTDIR log message, anyway...

You must have had problems...

Anyway, here are the patches to clean up the mess.
Either apply (in a gcc-3.2 checkout)

	patch -p0 <gcc-ada-spacefix.diff	# fix indents
	patch -p0 <gcc-ada-gnatchop.diff	# remove trash

or, if you don't want to fix spaces,

	patch -p0 -l <gcc-ada-gnatchop.diff

Use -l to ignore space changes here, or "patch" will suggest -R,
which is really no good idea.  Perhaps that's the mechanism that got
you into trouble.  (The 3.2 version would have matched exactly.)

The first gcc-ada-gnatchop hunk removes a wrong command sequence,
leaving the following right one.  The latter properly installs
the gnatchop binary, respecting cross-compiler names and tooldirs.
The wrong fragment tried to install a (presumably ancient) script
version of gnatchop.  That script did exist neither in the source
tree nor in the build tree; the associated tooldir installation
command had wrong arguments, and the tests in the surrounding
`if' constructs made no real sense.  That's why I removed it.
(Besides, in unix-like systems, both $(shext) and $(exeext)
are empty, so there would have been a name collision anyway.)

The second hunk removes a simplified and redundant installation
of gnatchop$(exeext) which has a `fi' missing.  I recalled that
the missing `fi' was in the 3.3/3.4 version (the 3.2 had the `fi'
but was nevertheless redundant), that's why I took a closer look.

Index: gcc/ada/ChangeLog
from  Christian Cornelssen  <ccorn@cs.tu-berlin.de>

	* Make-lang.in (gnattools, ada.install-common):
	Complete indentation fixes.
	(ada.install-common): Now really remove the erroneous and
	redundant gnatchop installation commands.

Regards,

Christian Cornelssen

Attachment: gcc-ada-spacefix.diff
Description: Text document

Attachment: gcc-ada-gnatchop.diff
Description: Text document