summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2022-05-17 10:59:36 +0300
committerEfraim Flashner <efraim@flashner.co.il>2022-05-17 12:38:29 +0300
commit2d229578bd50b7137603ff14ce5588784a6c07b9 (patch)
tree051cfeca36cb17799e67afd1a2c362dd02ad7a58
parenteab070a89d9906359ffe0a90c96b74771d836f19 (diff)
gnu: atop: Adjust build.
* gnu/packages/admin.scm (atop)[arguments]: Adjust custom 'patch-build phase to remove references to '/usr' and adjust make-flags accordingly. Remove trailing #t.
-rw-r--r--gnu/packages/admin.scm10
1 files changed, 3 insertions, 7 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 34df56d5e7..30f51ef4b3 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4707,13 +4707,8 @@ Netgear devices.")
#:make-flags
(list (string-append "CC=" ,(cc-for-target))
(string-append "DESTDIR=" (assoc-ref %outputs "out"))
- (string-append "BINPATH=/bin")
- (string-append "SBINPATH=/sbin")
(string-append "SYSDPATH=/etc/systemd/system")
(string-append "PMPATHD=/etc/systemd/system-sleep")
- (string-append "MAN1PATH=/share/man/man1")
- (string-append "MAN5PATH=/share/man/man5")
- (string-append "MAN8PATH=/share/man/man8")
;; Or else it tries to create /var/log/atop...
(string-append "LOGPATH="))
#:phases
@@ -4722,10 +4717,11 @@ Netgear devices.")
(add-before 'build 'patch-build
(lambda _
(substitute* "Makefile"
+ ;; Don't use /usr as a prefix
+ (("/usr") "")
;; Otherwise, it creates a blank configuration file as a "default".
(("touch.*DEFPATH)/atop") "")
- (("chmod.*DEFPATH)/atop") ""))
- #t)))))
+ (("chmod.*DEFPATH)/atop") "")))))))
(inputs
`(("ncurses" ,ncurses)
("python" ,python-wrapper) ; for `atopgpud`