diff options
| author | Werner Lemberg <wl@gnu.org> | 2015-06-25 13:04:57 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2015-06-26 06:48:00 +0200 |
| commit | 392cf22f8a5a281b8ebc56bf932e66da78f66410 (patch) | |
| tree | 53158763d4e9c490d96351eac9dc1e6adbc8ef00 /builds/toplevel.mk | |
| parent | 41bfbadcd3eaadc6b324fdd93c3adb185b048dbb (diff) | |
| download | freetype2-392cf22f8a5a281b8ebc56bf932e66da78f66410.tar.gz | |
Another adjustment to header locations.
This change is a result of a discussion thread on freetype-devel
http://lists.nongnu.org/archive/html/freetype-devel/2015-06/msg00041.html
Re-introduce the `freetype2' subdirectory for all FreeType header
files after installation, and rename the `freetype2' subdirectory in
the git repository to `freetype'.
* include/freetype2: Renamed to...
* include/freetype: This.
* CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS,
PRIVATE_HEADERS): Updated.
Update creation of `ftconfig.h'.
Install generated `ftconfig.h'.
* 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/freetype2.in: Updated.
* builds/unix/freetype-config.in: Updated.
* builds/unix/configure.raw: Don't check for `rmdir'.
* builds/unix/unix-def.in (DELDIR): Use `rm -rf', which is portable
according to the autoconf info manual.
* builds/unix/install.mk (install, uninstall,
distclean_project_unix): Update and simplify.
* 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 'builds/toplevel.mk')
| -rw-r--r-- | builds/toplevel.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builds/toplevel.mk b/builds/toplevel.mk index 05d7ec8dc..243c11330 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -172,7 +172,7 @@ 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/freetype2/freetype.h)) +work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype/freetype.h)) work := $(subst |,x,$(work)) work := $(subst $(space),|,$(work)) work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work)) |