[PATCH] gnu: wireless-tools: Install the manual pages under $out/share/man

[PATCH] gnu: wireless-tools: Install the manual pages under $out/share/man

[宋文武]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-wireless-tools-Install-the-manual-pages-under-ou.patch --]
[-- Type: text/x-patch, Size: 1266 bytes --]

From f961e72823cda48406d0058902c67b6b663da791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sat, 29 Nov 2014 12:52:59 +0800
Subject: [PATCH] gnu: wireless-tools: Install the manual pages under
 $out/share/man.

* gnu/packages/linux.scm (wireless-tools)[origin]: Add snippet.
---
 gnu/packages/linux.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b9d9bd6..0651c08 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1487,7 +1487,13 @@ mapper.  Kernel components are part of Linux-libre.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0qscyd44jmhs4k32ggp107hlym1pcyjzihiai48xs7xzib4wbndb"))))
+                "0qscyd44jmhs4k32ggp107hlym1pcyjzihiai48xs7xzib4wbndb"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Install the manual pages in the right place.
+               '(substitute* "Makefile"
+                  (("INSTALL_MAN= .*")
+                   "INSTALL_MAN= $(PREFIX)/share/man")))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases (alist-replace
-- 
2.1.2


[-- Attachment #2: Type: text/plain, Size: 471 bytes --]


We could get rid of MANPATH, if all man pages install to $out/share/man.
Assume a suitable PATH is set, try:
  $ guix package -r wireless-tools
  $ env MANPATH= manpath
Get:
  /run/current-system/profile/man:/home/iyzsong/.guix-profile/share/man
It's because wireless-tools having man pages in $out/man, after apply
this patch, we should get:
  /run/current-system/profile/share/man:/home/iyzsong/.guix-profile/share/man

Then `man' will just work even without MANPATH.

Re: [PATCH] gnu: wireless-tools: Install the manual pages under $out/share/man

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> From f961e72823cda48406d0058902c67b6b663da791 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
> Date: Sat, 29 Nov 2014 12:52:59 +0800
> Subject: [PATCH] gnu: wireless-tools: Install the manual pages under
>  $out/share/man.
>
> * gnu/packages/linux.scm (wireless-tools)[origin]: Add snippet.

Thanks, applied.

It may be a good time to get commit access.  Could you create an account
on Savannah and let me know?

> We could get rid of MANPATH, if all man pages install to $out/share/man.

Yes, it’s always been the goal to uniformly use share/man.

In core-updates, I’d like to add a build phase at the very end that
checks a few things like that, and aborts on failure.  WDYT?

> Assume a suitable PATH is set, try:
>   $ guix package -r wireless-tools
>   $ env MANPATH= manpath
> Get:
>   /run/current-system/profile/man:/home/iyzsong/.guix-profile/share/man
> It's because wireless-tools having man pages in $out/man, after apply
> this patch, we should get:
>   /run/current-system/profile/share/man:/home/iyzsong/.guix-profile/share/man
> 
> Then `man' will just work even without MANPATH.

Indeed.  I didn’t know MANPATH was unneeded in this case.

Thanks!

Ludo’.

Re: [PATCH] gnu: wireless-tools: Install the manual pages under $out/share/man

[宋文武]

Ludovic Courtès <ludo@gnu.org> writes:

> 宋文武 <iyzsong@gmail.com> skribis:
>
>> From f961e72823cda48406d0058902c67b6b663da791 Mon Sep 17 00:00:00 2001
>> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
>> Date: Sat, 29 Nov 2014 12:52:59 +0800
>> Subject: [PATCH] gnu: wireless-tools: Install the manual pages under
>>  $out/share/man.
>>
>> * gnu/packages/linux.scm (wireless-tools)[origin]: Add snippet.
>
> Thanks, applied.
>
> It may be a good time to get commit access.  Could you create an account
> on Savannah and let me know?
Thanks for the trust!
I have some problems to get the account activated now,
once done, I will ping you :)
>
>> We could get rid of MANPATH, if all man pages install to $out/share/man.
>
> Yes, it’s always been the goal to uniformly use share/man.
>
> In core-updates, I’d like to add a build phase at the very end that
> checks a few things like that, and aborts on failure.  WDYT?
Yes, sounds great.
>
>> Assume a suitable PATH is set, try:
>>   $ guix package -r wireless-tools
>>   $ env MANPATH= manpath
>> Get:
>>   /run/current-system/profile/man:/home/iyzsong/.guix-profile/share/man
>> It's because wireless-tools having man pages in $out/man, after apply
>> this patch, we should get:
>>   /run/current-system/profile/share/man:/home/iyzsong/.guix-profile/share/man
>> 
>> Then `man' will just work even without MANPATH.
>
> Indeed.  I didn’t know MANPATH was unneeded in this case.
>
> Thanks!
>
> Ludo’.

Re: [PATCH] gnu: wireless-tools: Install the manual pages under $out/share/man

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> I have some problems to get the account activated now,
> once done, I will ping you :)

You should be all set now.  Happy hacking!

Ludo’.