modula2: Fully respect DESTDIR in texi rule

Message ID 20240520230149.3715520-1-sam@gentoo.org
State Committed
Commit 232a86f9640cde6908d0875b8df52c36030c5b5e
Headers
Series modula2: Fully respect DESTDIR in texi rule |

Checks

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

Commit Message

Sam James May 20, 2024, 11:01 p.m. UTC
  This was originally reported in Gentoo at https://bugs.gentoo.org/930014.

2024-05-20  Sam James <sam@gentoo.org>
    gcc/m2/
    * Make-lang.in (m2.install-info): Pass --destdir for dir index.
---
 gcc/m2/Make-lang.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Gaius Mulley May 20, 2024, 11:20 p.m. UTC | #1
Sam James <sam@gentoo.org> writes:

> This was originally reported in Gentoo at https://bugs.gentoo.org/930014.
>
> 2024-05-20  Sam James <sam@gentoo.org>
>     gcc/m2/
>     * Make-lang.in (m2.install-info): Pass --destdir for dir index.
> ---
>  gcc/m2/Make-lang.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
> index 0abd8ce14555..da4226123dff 100644
> --- a/gcc/m2/Make-lang.in
> +++ b/gcc/m2/Make-lang.in
> @@ -425,7 +425,7 @@ m2.install-info: installdirs
>  	else true; fi
>  	-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)/m2.info; \
> +	    install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/m2.info; \
>  	  else true; fi; \
>  	else true; fi

thanks for the patch and url above - looks good to me,

regards,
Gaius
  

Patch

diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 0abd8ce14555..da4226123dff 100644
--- a/gcc/m2/Make-lang.in
+++ b/gcc/m2/Make-lang.in
@@ -425,7 +425,7 @@  m2.install-info: installdirs
 	else true; fi
 	-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)/m2.info; \
+	    install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/m2.info; \
 	  else true; fi; \
 	else true; fi