summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2019-03-08 01:15:21 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2019-03-09 02:33:31 +0100
commit37fc44eab9a557550a7b1304ac95388949c20eaa (patch)
tree3f5bdd34ecbcf2ca111b01f3eeeded49bde53938
parentf762e49f28dbd2bcb0ec0717a36c16da27f9da0b (diff)
gnu: dovecot: Avoid unnecessary patching.
* gnu/packages/mail.scm (dovecot)[arguments]: Replace ‘pre-configure’ patching with custom ‘make install sysconfdir=…’.
-rw-r--r--gnu/packages/mail.scm15
1 files changed, 6 insertions, 9 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fb990371af..e51d691006 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1305,14 +1305,6 @@ facilities for checking incoming mail.")
"--localstatedir=/var")
#:phases
(modify-phases %standard-phases
- (add-before 'configure 'pre-configure
- (lambda _
- ;; Simple hack to avoid installing in /etc.
- (substitute* '("doc/Makefile.in"
- "doc/example-config/Makefile.in")
- (("pkgsysconfdir = .*")
- "pkgsysconfdir = /tmp/etc"))
- #t))
(add-after 'unpack 'patch-file-names
(lambda _
(substitute* "src/lib-program-client/test-program-client-local.c"
@@ -1325,7 +1317,12 @@ facilities for checking incoming mail.")
(substitute* (list "src/lib-smtp/test-bin/sendmail-exit-1.sh"
"src/lib-smtp/test-bin/sendmail-success.sh")
(("cat") (which "cat")))
- #t)))))
+ #t))
+ (replace 'install
+ (lambda* (#:key make-flags #:allow-other-keys)
+ ;; Simple hack to avoid installing a trivial README in /etc.
+ (apply invoke "make" "install" "sysconfdir=/tmp/bogus"
+ make-flags))))))
(home-page "https://www.dovecot.org")
(synopsis "Secure POP3/IMAP server")
(description