Re: [PATCH] fixincludes: use $(FI) instead of fixincl at EXEEXT@

[Bernhard Reutner-Fischer <rep dot dot dot nop at gmail dot com>]

On 4 April 2013 22:20, Bruce Korb <bkorb@gnu.org> wrote:
> Except as noted below, fine by me.
>
> On 04/04/13 12:56, Bernhard Reutner-Fischer wrote:
>> Bootstrapped and regtested on x86_64-unknown-linux-gnu and
>> x86_64-mine-linux-uclibc without regressions, ok for trunk?
>>
>> fixincludes/ChangeLog:
>>
>> 2013-04-04  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
>>
>>       Makefile.in: Use $(FI) instead of fixincl@EXEEXT@.
>>       Cleanup whitespace while at it.
>>
>> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
>> ---
>>  fixincludes/Makefile.in |   10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
>> index ce850ff..3dc869d 100644
>> --- a/fixincludes/Makefile.in
>> +++ b/fixincludes/Makefile.in
>> @@ -131,7 +131,7 @@ fixinc.sh : fixinc.in mkfixinc.sh Makefile
>>  $(srcdir)/fixincl.x: @MAINT@ fixincl.tpl inclhack.def
>>       cd $(srcdir) ; $(SHELL) ./genfixes
>>
>> -mostlyclean :
>> +mostlyclean:
>
> I see no reason for changing things.

dropped this hunk.

> But if you are going to "clean up" the colons, then they should
> be in columns (mostly 12 or 16).  This one is already in 12.
>
>>       rm -f *.o *-stamp $(AF) $(FI) *~ fixinc.sh
>>
>>  clean: mostlyclean
>> @@ -179,18 +179,18 @@ check : all
>>
>>  install : all
>>       -rm -rf $(DESTDIR)$(itoolsdir)
>> -     $(mkinstalldirs) $(DESTDIR)$(itoolsdir)
>> +     $(mkinstalldirs) $(DESTDIR)$(itoolsdir)
>>       $(mkinstalldirs) $(DESTDIR)$(itoolsdatadir)/include
>>       $(INSTALL_DATA) $(srcdir)/README-fixinc \
>>         $(DESTDIR)$(itoolsdatadir)/include/README
>>       $(INSTALL_SCRIPT) fixinc.sh $(DESTDIR)$(itoolsdir)/fixinc.sh
>> -     $(INSTALL_PROGRAM) fixincl@EXEEXT@ \
>> -       $(DESTDIR)$(itoolsdir)/fixincl@EXEEXT@
>> +     $(INSTALL_PROGRAM) $(FI) \
>> +       $(DESTDIR)$(itoolsdir)/$(FI)
>
> This should now fit on a single line.

ok
>
>>       $(INSTALL_SCRIPT) mkheaders $(DESTDIR)$(itoolsdir)/mkheaders
>>
>>  install-strip: install
>>       test -z '$(STRIP)' \
>> -       || $(STRIP) $(DESTDIR)$(itoolsdir)/fixincl@EXEEXT@
>> +       || $(STRIP) $(DESTDIR)$(itoolsdir)/$(FI)

changed this too to be on a single line now.
>>
>>  .PHONY: all check install install-strip
>>  .PHONY: dvi pdf info html install-pdf install-info install-html

Changelog remains the same.
II was using the attached updated patch since April, ok for trunk?

Attachment: commit-8788d7c
Description: Binary data