diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2012-10-04 12:21:18 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-10-04 14:20:17 +0200 |
| commit | 7643a53e1263d196379f778b63d64ccff09b21b8 (patch) | |
| tree | 4615dd467621af140a274d9bcf450de69fd1ce44 /crawl-ref/source/Makefile | |
| parent | b13266e1ba684996eca41aa55b43caba1dfa3507 (diff) | |
| download | crawl-ref-7643a53e1263d196379f778b63d64ccff09b21b8.tar.gz crawl-ref-7643a53e1263d196379f778b63d64ccff09b21b8.zip | |
Properly escape shell variables
b13266e broke finding the system fonts.
Signed-off-by: Raphael Langella <raphael.langella@gmail.com>
Diffstat (limited to 'crawl-ref/source/Makefile')
| -rw-r--r-- | crawl-ref/source/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index dc218e8e0f..ddfb2424cf 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -859,9 +859,9 @@ ifdef PROPORTIONAL_FONT INSTALL_FONTS += $(PROPORTIONAL_FONT) endif else - SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $dir ] && find $dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) + SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) ifeq (,$(SYS_PROPORTIONAL_FONT)) - SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $dir ] && find $dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) + SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) endif ifneq (,$(SYS_PROPORTIONAL_FONT)) ifeq (,$(COPY_FONTS)) @@ -882,9 +882,9 @@ ifdef MONOSPACED_FONT INSTALL_FONTS += $(MONOSPACED_FONT) endif else - SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $dir ] && find $dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) + SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) ifeq (,$(SYS_MONOSPACED_FONT)) - SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $dir ] && find $dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) + SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) endif ifneq (,$(SYS_MONOSPACED_FONT)) ifeq (,$(COPY_FONTS)) |