[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: cmst: Don't install files to usr.
|
From: |
guix-commits |
|
Subject: |
03/03: gnu: cmst: Don't install files to usr. |
|
Date: |
Mon, 17 Jun 2019 03:03:06 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 55350f8316f693401506e85684b3faf0627c4a80
Author: Efraim Flashner <address@hidden>
Date: Mon Jun 17 09:28:42 2019 +0300
gnu: cmst: Don't install files to usr.
* gnu/packages/connman.scm (cmst)[arguments]: Move custom 'fix-Makefiles
phase before 'build. Add more substitutions.
---
gnu/packages/connman.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm
index 39262b8..df5aa7b 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017, 2019 Efraim Flashner <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Clément Lassieur <address@hidden>
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
@@ -160,13 +160,22 @@ sharing) to clients via USB, ethernet, WiFi, cellular and
Bluetooth.")
(invoke "qmake"
(string-append "PREFIX="
(assoc-ref outputs "out")))))
- (add-before 'install 'fix-Makefiles
+ (add-before 'build 'fix-Makefiles
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* (find-files "." "Makefile")
(("INSTALL_ROOT)")
(string-append "INSTALL_ROOT)" out))
- (("/usr/bin") "/bin"))))))))
+ (("/usr") ""))
+ (substitute* '("apps/cmstapp/cmstapp.pro"
+ "apps/cmstapp/code/control_box/controlbox.cpp"
+ "apps/rootapp/rootapp.pro"
+ "apps/rootapp/system/org.cmst.roothelper.service"
+ "cmst.pri"
+ "cmst.pro")
+ (("/usr") out)
+ (("/etc") (string-append out "/etc")))
+ #t))))))
(home-page "https://github.com/andrew-bibb/cmst";)
(synopsis "Qt frontend for Connman")
(description