rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix last commit (#52522). 

* builds/freetype.mk: Set `FT_OPTION_H' and `FTOPTION_FLAG'
properly if we have `ftoption.h' in `BUILD_DIR'.
This commit is contained in:
Jan Alexander Steffens (heftig) 2017-11-27 07:15:04 +01:00 committed by Werner Lemberg
parent 8f4851997b
commit 7d81ba7e17
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2017-11-27 Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Fix last commit (#52522).
* builds/freetype.mk: Set `FT_OPTION_H' and `FTOPTION_FLAG'
properly if we have `ftoption.h' in `BUILD_DIR'.
2017-11-24 Werner Lemberg <wl@gnu.org>
[unix] Install a massaged `ftoption.h' file (#51780).

3
builds/freetype.mk
View File

@ -153,6 +153,9 @@ endif
ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
FTOPTION_H := $(OBJ_DIR)/ftoption.h
FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
else ifneq ($(wildcard $(BUILD_DIR)/ftoption.h),)
FTOPTION_H := $(BUILD_DIR)/ftoption.h
FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
endif
# `CPPFLAGS' might be specified by the user in the environment.