08/08: gnu: fortune-mod: Clean up empty directory.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit e08474d650f144ecc73614b9655684b92000293d
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sat Aug 11 17:58:32 2018 +0200

    gnu: fortune-mod: Clean up empty directory.
    
    * gnu/packages/games.scm (fortune-mod)[arguments]: RMDIR ‘games/’ after
    emptying it.
---
 gnu/packages/games.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9b726cf..a16ecb8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5218,11 +5218,16 @@ Strife, Chex Quest, and fan-created games like Harmony, 
Hacx and Freedoom.")
                (chdir "fortune-mod")
                #t)))
          (add-after 'install 'fix-install-directory
-           ;; Move binary from "games/" to "bin/".
            (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (rename-file (string-append out "/games/fortune")
-                            (string-append out "/bin/fortune"))
+             ;; Move binary from "games/" to "bin/" and remove the latter.  
This
+             ;; is easier than patching CMakeLists.txt since the tests 
hard-code
+             ;; the location as well.
+             (let* ((out   (assoc-ref outputs "out"))
+                    (bin   (string-append out "/bin"))
+                    (games (string-append out "/games")))
+               (rename-file (string-append games "/fortune")
+                            (string-append bin "/fortune"))
+               (rmdir games)
                #t))))))
     (inputs `(("recode" ,recode)))
     (native-inputs