Subject: bug#33963: closed (Re: [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 05 Jan 2019 18:26:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
33963: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33963
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#33963] [PATCH] gnu: octave: Fix makeinfo path configuration
From: Arun Isaac <[email-masked]>
To: Kei Kebreau <[email-masked]>
Cc: [email-masked]
Date: Sat, 05 Jan 2019 23:55:18 +0530
List-Id: <debbugs-submit.debbugs.gnu.org>

Pushed, thanks for the review!

Subject: [PATCH] gnu: octave: Fix makeinfo path configuration
From: Arun Isaac <[email-masked]>
To: [email-masked]
Date: Thu, 03 Jan 2019 22:20:05 +0530
List-Id: <debbugs-submit.debbugs.gnu.org>

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 <[email-masked]>
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 <[email-masked]>
 ;;; Copyright © 2017 Ben Woodcroft <[email-masked]>
 ;;; Copyright © 2017 Theodoros Foradis <[email-masked]>
-;;; Copyright © 2017 Arun Isaac <[email-masked]>
+;;; Copyright © 2017, 2019 Arun Isaac <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017 Dave Love <me@[email-masked]>
 ;;; Copyright © 2018 Jan Nieuwenhuizen <[email-masked]>
@@ -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")
-- 
2.19.2