[2/2] modula2: Fix m2.install-info in gcc/m2/Make-lang.in

Message ID 20240329180903.3325518-2-christophe.lyon@linaro.org
State Committed
Commit 14d0c863aa9415f5d78047910233d67d91f4ecf5
Headers
Series [1/2] modula2: Add m2.install-html rule to gcc/m2/Make-lang.in |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Testing passed

Commit Message

Christophe Lyon March 29, 2024, 6:09 p.m. UTC
  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(-)
  

Comments

Gaius Mulley March 30, 2024, 1:05 p.m. UTC | #1
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
  

Patch

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