[bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration

[Kei Kebreau]

Arun Isaac <address@hidden> writes:

> The makeinfo path now needs to be substituted in
> libinterp/corefcn/help.h, not libinterp/corefn/help.cc. I have addressed
> this in the attached patch.
>
> I have also filed a bug upstream asking them to add a configure flag
> --with-makeinfo. Hopefully, we won't have to manually substitute
> the path to makeinfo in the next release.
>
> https://savannah.gnu.org/bugs/index.php?55371
>
> From 36612684f6f7719aef4b1b9fd40632b8749fcd90 Mon Sep 17 00:00:00 2001
> From: Arun Isaac <address@hidden>
> Date: Thu, 3 Jan 2019 21:56:26 +0530
> Subject: [PATCH] gnu: octave: Fix makeinfo path configuration.
>
> * gnu/packages/maths.scm (octave-cli)[arguments]: Fix makeinfo path
> configuration in configure-makeinfo phase.
> ---
>  gnu/packages/maths.scm | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
> index 448d9e373..e67bc5e93 100644
> --- a/gnu/packages/maths.scm
> +++ b/gnu/packages/maths.scm
> @@ -19,7 +19,7 @@
>  ;;; Copyright © 2017 Nils Gillmann <address@hidden>
>  ;;; Copyright © 2017 Ben Woodcroft <address@hidden>
>  ;;; Copyright © 2017 Theodoros Foradis <address@hidden>
> -;;; Copyright © 2017 Arun Isaac <address@hidden>
> +;;; Copyright © 2017, 2019 Arun Isaac <address@hidden>
>  ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
>  ;;; Copyright © 2017 Dave Love <address@hidden@gnu.org>
>  ;;; Copyright © 2018 Jan Nieuwenhuizen <address@hidden>
> @@ -1484,11 +1484,10 @@ can solve two kinds of problems:
>         (modify-phases %standard-phases
>           (add-after 'configure 'configure-makeinfo
>             (lambda* (#:key inputs #:allow-other-keys)
> -             (substitute* "libinterp/corefcn/help.cc"
> -               (("Vmakeinfo_program = \"makeinfo\"")
> -                (string-append "Vmakeinfo_program = \""
> -                               (assoc-ref inputs "texinfo")
> -                               "/bin/makeinfo\"")))
> +             (substitute* "libinterp/corefcn/help.h"
> +               (("\"makeinfo\"")
> +                (string-append
> +                 "\"" (assoc-ref inputs "texinfo") "/bin/makeinfo\"")))
>               #t)))))
>      (home-page "https://www.gnu.org/software/octave/";)
>      (synopsis "High-level language for numerical computation")

LGTM.

signature.asc
Description: PGP signature