[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 7109495: * builds/toplevel.mk (work): Use $(SEP).
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 7109495: * builds/toplevel.mk (work): Use $(SEP). |
Date: |
Sun, 1 Apr 2018 07:25:25 -0400 (EDT) |
branch: master
commit 7109495c5e6cd79f9b97d6773f4111ed0aeff99b
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
* 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 <address@hidden>.
---
ChangeLog | 9 +++++++++
builds/toplevel.mk | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index cc2c777..071ef02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-04-01 Werner Lemberg <address@hidden>
+
+ * 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 <address@hidden>.
+
2018-03-30 Werner Lemberg <address@hidden>
[truetype] Fix memory leak (only if tracing is on).
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index f51ad16..7ce0ed8 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 7109495: * builds/toplevel.mk (work): Use $(SEP).,
Werner LEMBERG <=