diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-10-19 10:20:02 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-10-19 22:22:02 -0400 |
| commit | d73131b9315abf39fc2d307b1c59bf8edd1e43ac (patch) | |
| tree | ae379b4cb5f6dd803fcec3514a6d6529c70626e8 | |
| parent | f8ce38e62c19fb346f33b246efc205fb37999d14 (diff) | |
| download | haskell-d73131b9315abf39fc2d307b1c59bf8edd1e43ac.tar.gz | |
hadrian: Fix quoting in binary distribution installation Makefile
Previously we failed to quote various paths in Hadrian's installation
Makefile, resulting in #20506.
| -rw-r--r-- | hadrian/bindist/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index 7dea178000..327d56e090 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -30,9 +30,9 @@ define installscript # to it. This implementation is a bit hacky and depends on consistency # of program names. For hadrian build this will work as programs have a # consistent naming procedure. - if [ -L wrappers/$1 ]; then echo "$1 is a symlink"; fi - @if [ -L wrappers/$1 ]; then \ - cp -RP wrappers/$1 '$2'; \ + if [ -L 'wrappers/$1' ]; then echo "$1 is a symlink"; fi + @if [ -L 'wrappers/$1' ]; then \ + cp -RP 'wrappers/$1' '$2'; \ else \ rm -f '$2' && \ $(CREATE_SCRIPT) '$2' && \ @@ -45,7 +45,7 @@ define installscript echo "docdir=\"$7\"" >> '$2' && \ echo "includedir=\"$8\"" >> '$2' && \ echo "" >> '$2' && \ - cat wrappers/$1 >> '$2' && \ + cat 'wrappers/$1' >> '$2' && \ $(EXECUTABLE_FILE) '$2' ; \ fi @echo "$1 installed to $2" |