02/02: gnu: nginx: Clean up installation directories.

[David Thompson]

davexunit pushed a commit to branch master
in repository guix.

commit 59446b208c9b3a9f1901cd6ba518768220903dc9
Author: David Thompson <address@hidden>
Date:   Sun Apr 5 12:34:45 2015 -0400

    gnu: nginx: Clean up installation directories.
    
    * gnu/packages/web.scm (nginx): Add 'fix-root-dirs' phase.
---
 gnu/packages/web.scm |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 031bbca..3746428 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -137,7 +137,22 @@ and its related documentation.")
                (setenv "CC" "gcc")
                (format #t "environment variable `CC' set to `gcc'~%")
                (format #t "configure flags: ~s~%" flags)
-               (zero? (apply system* "./configure" flags))))))))
+               (zero? (apply system* "./configure" flags)))))
+         (add-after install fix-root-dirs
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; 'make install' puts things in strange places, so we need to
+             ;; clean it up ourselves.
+             (let* ((out (assoc-ref outputs "out"))
+                    (share (string-append out "/share/nginx")))
+               ;; This directory is empty, so get rid of it.
+               (rmdir (string-append out "/logs"))
+               ;; Example configuration and HTML files belong in
+               ;; /share.
+               (mkdir-p share)
+               (rename-file (string-append out "/conf")
+                            (string-append share "/conf"))
+               (rename-file (string-append out "/html")
+                            (string-append share "/html"))))))))
     (home-page "http://nginx.org";)
     (synopsis "HTTP and reverse proxy server")
     (description