From e08474d650f144ecc73614b9655684b92000293d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Aug 2018 17:58:32 +0200 Subject: gnu: fortune-mod: Clean up empty directory. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (fortune-mod)[arguments]: RMDIR ‘games/’ after emptying it. --- gnu/packages/games.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9b726cf129..a16ecb81a8 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 -- cgit v1.2.3