HCoop
/
jackhill
/
guix
/
guix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e5deea
)
utils: Change 'patch-makefile-SHELL' to support ":=" assignments.
author
Ludovic Courtès
<ludo@gnu.org>
Fri, 12 Dec 2014 23:06:32 +0000
(
00:06
+0100)
committer
Ludovic Courtès
<ludo@gnu.org>
Fri, 12 Dec 2014 23:06:32 +0000
(
00:06
+0100)
Reported by Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>.
* guix/build/utils.scm (patch-makefile-SHELL): Update regexp to match
":=" assignments.
guix/build/utils.scm
patch
|
blob
|
blame
|
history
diff --git
a/guix/build/utils.scm
b/guix/build/utils.scm
index
01ac896
..
be91fb4
100644
(file)
--- 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)))