From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: [PATCHES] gnu: nginx: Clean up installation directories. Date: Sun, 05 Apr 2015 15:58:34 -0400 Message-ID: <871tjy5out.fsf@netris.org> References: <87oan2fs4m.fsf@fsf.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeqgQ-0000Db-4Y for guix-devel@gnu.org; Sun, 05 Apr 2015 15:58:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeqgJ-0003B7-Ug for guix-devel@gnu.org; Sun, 05 Apr 2015 15:58:12 -0400 Received: from world.peace.net ([50.252.239.5]:56800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeqgJ-0003B0-Qv for guix-devel@gnu.org; Sun, 05 Apr 2015 15:58:07 -0400 In-Reply-To: <87oan2fs4m.fsf@fsf.org> (David Thompson's message of "Sun, 05 Apr 2015 12:37:45 -0400") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: David Thompson Cc: guix-devel@gnu.org David Thompson writes: > From 81adae7d0de6e6d9213b81dc6a8747bfc6487420 Mon Sep 17 00:00:00 2001 > From: David Thompson > Date: Sun, 5 Apr 2015 12:31:54 -0400 > Subject: [PATCH 1/2] gnu: nginx: Use modify-phases syntax. Okay. > From 6757351ece10cafc5e9c04f5778e6ba6334979d5 Mon Sep 17 00:00:00 2001 > From: David Thompson > Date: Sun, 5 Apr 2015 12:34:45 -0400 > Subject: [PATCH 2/2] gnu: nginx: Clean up installation directories. > > * gnu/packages/web.scm (nginx): Add 'fix-root-dirs' phase. > --- > gnu/packages/web.scm | 20 +++++++++++++++++++- > 1 file changed, 19 insertions(+), 1 deletion(-) > > > diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm > index 031bbca..c41e9ba 100644 > --- a/gnu/packages/web.scm > +++ b/gnu/packages/web.scm > @@ -137,7 +137,25 @@ 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")) Okay. > + ;; No reason to use /sbin > + (rename-file (string-append out "/sbin") > + (string-append out "/bin")))))))) I would prefer to avoid diverging from upstream without good reason, and I don't see a good reason for this change. What do you think? Okay to push everything here except for the /sbin -> /bin change. Thanks! Mark