From 544672029213ae5ec79e2083a50e0e83edff18a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:52:18 +0200 Subject: [PATCH] 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 1ce3cde617..6387e84a3d 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