[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/13: gnu: filters: Fix bogus use of DESTDIR.
From: |
guix-commits |
Subject: |
07/13: gnu: filters: Fix bogus use of DESTDIR. |
Date: |
Fri, 16 Oct 2020 11:51:52 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 544672029213ae5ec79e2083a50e0e83edff18a6
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Oct 16 16:52:18 2020 +0200
gnu: filters: Fix bogus use of DESTDIR.
* gnu/packages/toys.scm (filters)[arguments]: Set and respect the
standard prefix variable.
---
gnu/packages/toys.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index 1ce3cde..6387e84 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -101,17 +101,17 @@ typing @command{sl} instead of @command{ls}.")
(arguments
`(#:make-flags
(list (string-append "CC=" ,(cc-for-target))
- (string-append "DESTDIR=" %output))
+ (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure)
- (add-after 'unpack 'fix-install-directories
+ (add-after 'unpack 'respect-prefix
(lambda _
(substitute* "Makefile"
(("/usr/games")
- "/bin/")
- (("/usr/share/")
- "/share/"))
+ "$(prefix)/bin/")
+ (("/usr")
+ "$(prefix)"))
#t)))
#:tests? #f)) ; no test suite
(native-inputs
- branch master updated (f6a0b54 -> 1e39c86), guix-commits, 2020/10/16
- 01/13: gnu: spread-sheet-widget: Update to 0.7., guix-commits, 2020/10/16
- 03/13: gnu: vim: Update to 8.2.1852., guix-commits, 2020/10/16
- 09/13: gnu: multitail: Remove bogus use of DESTDIR., guix-commits, 2020/10/16
- 02/13: gnu: gpxsee: Update to 7.34., guix-commits, 2020/10/16
- 04/13: gnu: filters: Prepare for cross-compilation., guix-commits, 2020/10/16
- 08/13: gnu: dstat: Fix bogus use of DESTDIR., guix-commits, 2020/10/16
- 06/13: gnu: filters: Fix repository URL., guix-commits, 2020/10/16
- 05/13: gnu: filters: Replace git commit with equivalent tag., guix-commits, 2020/10/16
- 07/13: gnu: filters: Fix bogus use of DESTDIR.,
guix-commits <=
- 11/13: gnu: multitail: Edit synopsis & description., guix-commits, 2020/10/16
- 12/13: gnu: make-lua-ossl: Fix bogus use of DESTDIR., guix-commits, 2020/10/16
- 10/13: gnu: multitail: Cross-compile., guix-commits, 2020/10/16
- 13/13: gnu: iproute2: Update to 5.9.0., guix-commits, 2020/10/16