guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: gnu: vsftpd: Let the build system create directories.


From: guix-commits
Subject: 03/04: gnu: vsftpd: Let the build system create directories.
Date: Fri, 2 Jul 2021 01:15:35 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit a6e8a9c3340e8f6dcee92dcc3f17d8449d282982
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Jul 2 04:42:51 2021 +0200

    gnu: vsftpd: Let the build system create directories.
    
    * gnu/packages/ftp.scm (vsftpd)[arguments]: Pass the "-D" flag to
    ‘install’.  Remove the now redundant 'mkdir phase.
---
 gnu/packages/ftp.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index c79991e..5d07052 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -270,7 +270,8 @@ directory comparison and more.")
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-       (list "LDFLAGS=-lcap -lcrypt -lpam")
+       (list "LDFLAGS=-lcap -lcrypt -lpam"
+             "INSTALL=install -D")
        #:tests? #f                      ; no test suite
        #:phases
        (modify-phases %standard-phases
@@ -284,17 +285,7 @@ directory comparison and more.")
          (add-after 'unpack 'patch-installation-directory
            (lambda* (#:key outputs #:allow-other-keys)
              (substitute* "Makefile"
-               (("/usr") (assoc-ref outputs "out")))
-             #t))
-         (add-before 'install 'mkdir
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (mkdir-p out)
-               (mkdir (string-append out "/sbin"))
-               (mkdir (string-append out "/man"))
-               (mkdir (string-append out "/man/man5"))
-               (mkdir (string-append out "/man/man8"))
-               #t)))
+               (("/usr") (assoc-ref outputs "out")))))
          (delete 'configure))))         ; no configure script
     (inputs
      `(("libcap" ,libcap)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]