diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-04-01 13:24:59 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-04-01 13:24:59 +0200 |
| commit | 7109495c5e6cd79f9b97d6773f4111ed0aeff99b (patch) | |
| tree | aeeef353e4f1401a586bdb50f54e2640101a0edd | |
| parent | 597cb3b44267325d6aa8ee32bf5b7712aa2b588f (diff) | |
| download | freetype2-7109495c5e6cd79f9b97d6773f4111ed0aeff99b.tar.gz | |
* builds/toplevel.mk (work): Use $(SEP).
This fixes the `make refdoc' using Cygwin: $(CAT) is `type' on this
platform, and this program only understands backslashes in paths.
Reported by Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com>.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | builds/toplevel.mk | 3 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2018-04-01 Werner Lemberg <wl@gnu.org> + + * builds/toplevel.mk (work): Use $(SEP). + + This fixes the `make refdoc' using Cygwin: $(CAT) is `type' on this + platform, and this program only understands backslashes in paths. + + Reported by Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com>. + 2018-03-30 Werner Lemberg <wl@gnu.org> [truetype] Fix memory leak (only if tracing is on). diff --git a/builds/toplevel.mk b/builds/toplevel.mk index f51ad16b9..7ce0ed8db 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -172,7 +172,8 @@ include $(TOP_DIR)/builds/modules.mk # get FreeType version string, using a # poor man's `sed' emulation with make's built-in string functions # -work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype/freetype.h)) +work := $(strip $(shell $(CAT) \ + $(subst /,$(SEP),$(TOP_DIR)/include/freetype/freetype.h))) work := $(subst |,x,$(work)) work := $(subst $(space),|,$(work)) work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work)) |