guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: multipath-tools: Don't install to /usr sub-folders.


From: Marius Bakke
Subject: 01/02: gnu: multipath-tools: Don't install to /usr sub-folders.
Date: Tue, 18 Apr 2017 10:34:23 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit b5fb9430ba29ef80661a7730717399bf54f7115b
Author: Marius Bakke <address@hidden>
Date:   Tue Apr 18 15:30:22 2017 +0200

    gnu: multipath-tools: Don't install to /usr sub-folders.
    
    * gnu/packages/linux.scm (multipath-tools)<#:make-flags>: Add SYSTEMDPATH 
entry.
    <#:phases>: Add new 'patch-source' phase.
---
 gnu/packages/linux.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9730838..968aa9b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2630,11 +2630,17 @@ arrays when needed.")
      '(#:tests? #f ; No tests.
        #:make-flags (list (string-append "DESTDIR="
                                          (assoc-ref %outputs "out"))
+                          "SYSTEMDPATH=lib"
                           (string-append "LDFLAGS=-Wl,-rpath="
                                          (assoc-ref %outputs "out")
                                          "/lib"))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-source
+           (lambda _
+             (substitute* "Makefile.inc"
+               (("\\$\\(prefix\\)/usr") "$(prefix)"))
+             #t))
          (delete 'configure)
          (add-before 'build 'set-CC
            (lambda _



reply via email to

[Prev in Thread] Current Thread [Next in Thread]