[bug#31066] [PATCH] gnu: xapers: Fix man page and xapers-adder installation

[bug#31066] [PATCH] gnu: xapers: Fix man page and xapers-adder installation

[Adam Massmann]

[-- Attachment #1: Type: text/plain, Size: 365 bytes --]

Hi,

I found a bug in my recent contribution of xapers
(https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31007); my use of
"install-file" placed the man pages and xaper-adder in the wrong
directories. I am not sure how this made it past my tests, but I will be
much more careful in the future. I'm sorry for any inconvenience. A
patch to fix is attached.

Best,
Adam


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gnu: xapers: Fix man page and xapers-adder installation --]
[-- Type: text/x-diff, Size: 1378 bytes --]

From edaca7682afa090a0ae056e4db7d68573915d98c Mon Sep 17 00:00:00 2001
From: Adam Massmann <massmannak@gmail.com>
Date: Wed, 4 Apr 2018 18:14:11 -0400
Subject: [PATCH] gnu: xapers: Fix man page and xapers-adder installation

---
 gnu/packages/search.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index 64846cffe..02deb5c4a 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -344,12 +344,9 @@ search the generated indexes.")
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin"))
                     (man1 (string-append out "/share/man/man1")))
-               (install-file "man/man1/xapers.1"
-                             (string-append man1 "/xapers.1"))
-               (install-file "man/man1/xapers-adder.1"
-                             (string-append man1 "/xapers-adder.1"))
-               (install-file "bin/xapers-adder"
-                             (string-append bin "/xapers-adder"))))))))
+               (install-file "man/man1/xapers.1"  man1)
+               (install-file "man/man1/xapers-adder.1" man1)
+               (install-file "bin/xapers-adder" bin)))))))
     (home-page "https://finestructure.net/xapers/")
     (synopsis "Personal document indexing system")
     (description
-- 
2.11.0

bug#31066: [PATCH] gnu: xapers: Fix man page and xapers-adder installation

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 594 bytes --]

On Wed, 04 Apr 2018 19:10:08 -0400
Adam Massmann <massmannak@gmail.com> wrote:

> Hi,
> 
> I found a bug in my recent contribution of xapers
> (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31007); my use of
> "install-file" placed the man pages and xaper-adder in the wrong
> directories. I am not sure how this made it past my tests, but I will be
> much more careful in the future. I'm sorry for any inconvenience. A
> patch to fix is attached.
> 
> Best,
> Adam
> 

Thank you for the quick fix.
Pushed in b357ccdd8b6824a49f750e0f6b1afb87683adb82

Happy Hacking,
`~Eric

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]