From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbOAI-0005yw-Pv for guix-patches@gnu.org; Sat, 29 Jul 2017 05:36:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dbOAE-0004yY-OM for guix-patches@gnu.org; Sat, 29 Jul 2017 05:36:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57912) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dbOAE-0004yM-KY for guix-patches@gnu.org; Sat, 29 Jul 2017 05:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dbOAE-0001Yp-ER for guix-patches@gnu.org; Sat, 29 Jul 2017 05:36:02 -0400 Subject: [bug#27856] [PATCH] gnu: erlang: Fix install-doc phase. Resent-Message-ID: MIME-Version: 1.0 In-Reply-To: <874ltwl1pn.fsf@gnu.org> References: <20170728001051.1778-1-petermikkelsen10@gmail.com> <874ltwl1pn.fsf@gnu.org> From: Peter Mikkelsen Date: Sat, 29 Jul 2017 11:35:35 +0200 Message-ID: Content-Type: multipart/alternative; boundary="001a113f8b201688b405557185e1" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27856@debbugs.gnu.org --001a113f8b201688b405557185e1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Den 28. jul. 2017 22.57 skrev "Ludovic Court=C3=A8s" : Hi, Peter Mikkelsen skribis: > * gnu/packages/erlang.scm (erlang): Install > the man-pages to the correct directory. > --- > gnu/packages/erlang.scm | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm > index 07f117e28..6c702a2ba 100644 > --- a/gnu/packages/erlang.scm > +++ b/gnu/packages/erlang.scm > @@ -153,16 +153,15 @@ > (lambda* (#:key inputs outputs #:allow-other-keys) > (let* ((out (assoc-ref outputs "out")) > (manpages (assoc-ref inputs "erlang-manpages")) > - (share (string-append out "/share/"))) > - (mkdir-p share) > - (mkdir-p (string-append share "/misc/erlang")) > - (with-directory-excursion share > + (release-dir (string-append out "/lib/erlang"))) > + (with-directory-excursion release-dir > (and > (zero? (system* "tar" "xvf" manpages)) > (rename-file "COPYRIGHT" > - (string-append share "/misc/erlang/COPYRIGHT")) > - ;; Delete superfluous file. > - (delete-file "PR.template"))))))))) > + (string-append release-dir "/misc/COPYRIGHT")) IIUC, this installs man pages and =E2=80=98COPYRIGHT=E2=80=99 to OUT/lib/er= lang, right? Shouldn=E2=80=99t it go to OUT/share/erlang instead? Thanks, Ludo=E2=80=99. Oh sorry, my mistake. The way it was before made it possible to use the normal man tool instead of erl -man, which is great, but I didnt notice before now. You can ignorere this patch. Sorry for the inconvenience! --001a113f8b201688b405557185e1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


Den 28. jul. 2017 22.57 skrev "Ludovic Court=C3=A8s" &l= t;ludo@gnu.org>:
Hi,

Peter Mikkelsen <petermikk= elsen10@gmail.com> skribis:

> * gnu/packages/erlang.scm (erlang): Install
>=C2=A0 =C2=A0the man-pages to the correct directory.
> ---
>=C2=A0 gnu/packages/erlang.scm | 13 ++++++-------
>=C2=A0 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
> index 07f117e28..6c702a2ba 100644
> --- a/gnu/packages/erlang.scm
> +++ b/gnu/packages/erlang.scm
> @@ -153,16 +153,15 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(lambda* (#:key inputs = outputs #:allow-other-keys)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(let* ((out (ass= oc-ref outputs "out"))
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 (manpages (assoc-ref inputs "erlang-manpages"))
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= (share (string-append out "/share/")))
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(mkdir-p share)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(mkdir-p (string-appe= nd share "/misc/erlang"))
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(with-directory-excur= sion share
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= (release-dir (string-append out "/lib/erlang")))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(with-directory-excur= sion release-dir
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(and
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(z= ero? (system* "tar" "xvf" manpages))
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(r= ename-file "COPYRIGHT"
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (string-append share "/misc/erlang= /COPYRIGHT"))
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; Dele= te superfluous file.
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(delete= -file "PR.template")))))))))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (string-append release-dir "/misc/= COPYRIGHT"))

IIUC, this installs man pages and =E2=80=98COPYRIGHT=E2=80=99 to OUT/= lib/erlang, right?
Shouldn=E2=80=99t it go to OUT/share/erlang instead?

Thanks,
Ludo=E2=80=99.

= Oh sorry, my mistake. The way it was before made it possible to use the nor= mal man tool instead of erl -man, which is great, but I didnt notice before= now. You can ignorere this patch.

Sorry for the inconv= enience!
--001a113f8b201688b405557185e1--