[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: utils: Change 'patch-makefile-SHELL' to support ":=" assignments.
|
From: |
Ludovic Courtès |
|
Subject: |
02/02: utils: Change 'patch-makefile-SHELL' to support ":=" assignments. |
|
Date: |
Fri, 12 Dec 2014 23:06:44 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit c809ec94d11f1c7e23cccb988dfb1412aff72636
Author: Ludovic Courtès <address@hidden>
Date: Sat Dec 13 00:06:32 2014 +0100
utils: Change 'patch-makefile-SHELL' to support ":=" assignments.
Reported by Ricardo Wurmus <address@hidden>.
* guix/build/utils.scm (patch-makefile-SHELL): Update regexp to match
":=" assignments.
---
guix/build/utils.scm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index 01ac896..be91fb4 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -638,7 +638,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept
unchanged."
(let ((st (stat file)))
(substitute* file
- (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)(.*)$"
+ (("^ *SHELL[[:blank:]]*:?=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)(.*)$"
_ dir shell args)
(let* ((old (string-append dir shell))
(new (or (find-shell shell) old)))