From: Gaius Mulley <gaiusmod2@gmail.com>
To: Christophe Lyon <christophe.lyon@linaro.org>
Cc: gcc-patches@gcc.gnu.org
Subject: Re: [PATCH 2/2] modula2: Fix m2.install-info in gcc/m2/Make-lang.in
Date: Sat, 30 Mar 2024 13:05:03 +0000 [thread overview]
Message-ID: <87y19zooow.fsf@localhost> (raw)
In-Reply-To: <20240329180903.3325518-2-christophe.lyon@linaro.org> (Christophe Lyon's message of "Fri, 29 Mar 2024 18:09:03 +0000")
Christophe Lyon <christophe.lyon@linaro.org> writes:
> Fix a few typos: the generated filename is m2.info (not gm2.info, and
> gm2$(exeext) is a file not a directory (so test -d would always fail).
>
> 2024-03-29 Christophe Lyon <christophe.lyon@linaro.org>
>
> gcc/m2/
> * Make-lang.in (m2.install-info): Fix rule.
> ---
> gcc/m2/Make-lang.in | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
> index 2d8a47a1b1f..e56240b4c44 100644
> --- a/gcc/m2/Make-lang.in
> +++ b/gcc/m2/Make-lang.in
> @@ -400,20 +400,20 @@ m2.install-common: installdirs
> done
>
> m2.install-info: installdirs
> - if [ -d gm2$(exeext) ] ; then \
> - if [ -f $(objdir)/doc/gm2.info ]; then \
> - rm -f $(DESTDIR)$(infodir)/gm2.info*; \
> - for f in $(objdir)/doc/gm2.info*; do \
> + if [ -f gm2$(exeext) ] ; then \
> + if [ -f $(objdir)/doc/m2.info ]; then \
> + rm -f $(DESTDIR)$(infodir)/m2.info*; \
> + for f in $(objdir)/doc/m2.info*; do \
> realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
> rm -f $(DESTDIR)$(infodir)/`basename $$realfile`; \
> $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/`basename $$realfile`; \
> done; \
> - chmod a-x $(DESTDIR)$(infodir)/gm2.info*; \
> + chmod a-x $(DESTDIR)$(infodir)/m2.info*; \
> else true; fi; \
> else true; fi
> - -if [ -f gm2$(exeext) ] && [ -f $(DESTDIR)$(infodir)/gm2.info ]; then \
> + -if [ -f gm2$(exeext) ] && [ -f $(DESTDIR)$(infodir)/m2.info ]; then \
> if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
> - install-info --dir-file=$(infodir)/dir $(DESTDIR)$(infodir)/gm2.info; \
> + install-info --dir-file=$(infodir)/dir $(DESTDIR)$(infodir)/m2.info; \
> else true; fi; \
> else true; fi
lgtm, many thanks for spotting these bugs,
regards,
Gaius
next prev parent reply other threads:[~2024-03-30 13:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 18:09 [PATCH 1/2] modula2: Add m2.install-html rule to gcc/m2/Make-lang.in Christophe Lyon
2024-03-29 18:09 ` [PATCH 2/2] modula2: Fix m2.install-info in gcc/m2/Make-lang.in Christophe Lyon
2024-03-30 13:05 ` Gaius Mulley [this message]
2024-03-30 13:04 ` [PATCH 1/2] modula2: Add m2.install-html rule to gcc/m2/Make-lang.in Gaius Mulley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y19zooow.fsf@localhost \
--to=gaiusmod2@gmail.com \
--cc=christophe.lyon@linaro.org \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).