summaryrefslogtreecommitdiff
path: root/include/ft2build.h
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2015-06-22 06:35:23 +0200
committerWerner Lemberg <wl@gnu.org>2015-06-22 06:35:23 +0200
commit8502c98b15390a397de2d5826c9d8b017d7fc208 (patch)
tree90d3ab5eaa2a7337e6782a0c3795ad0d4aea90e7 /include/ft2build.h
parent31d97df99fb8c7f52d19d675b8d497753f719594 (diff)
downloadfreetype2-8502c98b15390a397de2d5826c9d8b017d7fc208.tar.gz
Fix Savannah bug #45097.
We no longer `pollute' the namespace of possible header file names; instead we move `ft2build.h' up by one level so that it gets installed in the default include directory (e.g., /usr/local/include). After this commit, only `ft2build.h' stays in the compiler's include path. No visible changes for the user who follows the standard FreeType header inclusion rules. * include/*: Move to ... * include/freetype2/*: This directory, except `ft2build.h'. * CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS, PRIVATE_HEADERS), Jamfile (HDRMACRO, RefDoc), autogen.sh: Updated. * builds/amiga/include/config/ftconfig.h, builds/freetype.mk (PUBLIC_DIR), builds/symbian/bld.inf, builds/toplevel.mk (work), builds/unix/install.mk (install, uninstall), builds/unix/freetype2.in: Updated. * builds/unix/freetype-config.in: Updated. Emit -I directory only if it is not `/usr/include'. * builds/wince/*, builds/windows/*: Updated. * devel/ft2build.h, include/ft2build.h: Updated. * include/freetype2/config/ftheader.h, include/freetype2/internal/ftserv.h, include/freetype2/internal/internal.h: Update all header file macros. * src/tools/chktrcmp.py (TRACE_DEF_FILES): Updated. * docs/*: Updated.
Diffstat (limited to 'include/ft2build.h')
-rw-r--r--include/ft2build.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ft2build.h b/include/ft2build.h
index 09c19d42a..9483d3307 100644
--- a/include/ft2build.h
+++ b/include/ft2build.h
@@ -34,7 +34,7 @@
#ifndef __FT2BUILD_H__
#define __FT2BUILD_H__
-#include <config/ftheader.h>
+#include <freetype2/config/ftheader.h>
#endif /* __FT2BUILD_H__ */