ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-28 14:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: vsftpd: Let the build system create directories.

Browse source 
* gnu/packages/ftp.scm (vsftpd)[arguments]: Pass the "-D" flag to
‘install’.  Remove the now redundant 'mkdir phase.
This commit is contained in:
Tobias Geerinckx-Rice 2021-07-02 04:42:51 +02:00
parent 4049fa8e52
commit a6e8a9c334
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/ftp.scm
View file

@ -270,7 +270,8 @@ (define-public vsftpd
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list "LDFLAGS=-lcap -lcrypt -lpam") (list "LDFLAGS=-lcap -lcrypt -lpam"
"INSTALL=install -D")
#:tests? #f ; no test suite #:tests? #f ; no test suite
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -284,17 +285,7 @@ (define-public vsftpd
(add-after 'unpack 'patch-installation-directory (add-after 'unpack 'patch-installation-directory
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile" (substitute* "Makefile"
(("/usr") (assoc-ref outputs "out"))) (("/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)))
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
(inputs (inputs
`(("libcap" ,libcap) `(("libcap" ,libcap)