shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix last commit (#52522).

* builds/freetype.mk: Set `FT_OPTION_H' and `FTOPTION_FLAG'
properly if we have `ftoption.h' in `BUILD_DIR'.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2017-11-27  Jan Alexander Steffens (heftig)  <[email protected]>

+

+	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  <[email protected]>

 	[unix] Install a massaged `ftoption.h' file (#51780).

--- a/builds/freetype.mk

+++ b/builds/freetype.mk

@@ -153,6 +153,9 @@

 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.