freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 7d81ba7: Fix last commit (#52522).


From: Werner LEMBERG
Subject: [freetype2] master 7d81ba7: Fix last commit (#52522).
Date: Mon, 27 Nov 2017 01:16:09 -0500 (EST)

branch: master
commit 7d81ba7e17ffe2eecf682025b02d652be3be496f
Author: Jan Alexander Steffens (heftig) <address@hidden>
Commit: Werner Lemberg <address@hidden>

    Fix last commit (#52522).
    
    * builds/freetype.mk: Set `FT_OPTION_H' and `FTOPTION_FLAG'
    properly if we have `ftoption.h' in `BUILD_DIR'.
---
 ChangeLog          | 7 +++++++
 builds/freetype.mk | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6a4c00b..ef5d5b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-11-27  Jan Alexander Steffens (heftig)  <address@hidden>
+
+       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  <address@hidden>
 
        [unix] Install a massaged `ftoption.h' file (#51780).
diff --git a/builds/freetype.mk b/builds/freetype.mk
index f8cfd41..d9dbf79 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]