From bbf33f304ad81edabacfe233bde1462ca43703d4 Mon Sep 17 00:00:00 2001 From: David Turner Date: Sat, 24 Mar 2001 00:42:45 +0000 Subject: [PATCH] small Unix installation update --- builds/unix/ft2unix.h | 33 +++++++++++++++++++++++++-------- builds/unix/install.mk | 1 + 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/builds/unix/ft2unix.h b/builds/unix/ft2unix.h index 06f72848c..0099f09d1 100644 --- a/builds/unix/ft2unix.h +++ b/builds/unix/ft2unix.h @@ -21,20 +21,37 @@ /* This is a Unix-specific version of that should be used */ /* exclusively *after* installation of the library. */ /* */ - /* Currently, the FreeType 2 root is at "freetype2/freetype", though it */ - /* will change to "freetype2" in the near future. */ + /* it assumes that "/usr/local/include/freetype2", or wathever is */ + /* returned by the "freetype-config --cflags" command is in your */ + /* compilation include path.. */ + /* */ + /* We don't need to do anything special in this release. However, for */ + /* FreeType 2.1, the following installation changes will be performed: */ + /* */ + /* - the content of "freetype-2.1/include/freetype" will be */ + /* installed to "/usr/local/include/freetype2" instead of */ + /* "/usr/local/include/freetype2/freetype" */ + /* */ + /* - this file will #include , instead */ + /* of */ + /* */ + /* - the content of "ftheader.h" will be processed through sed to */ + /* replace all "" with "" */ + /* */ + /* - adding "/usr/local/include/freetype2" to your compilation */ + /* include path will not be necessary anymore. The command */ + /* "freetype-config --cflags" will return an empty string */ + /* */ + /* - client applications who adhere to the new inclusion scheme */ + /* WILL NOT NEED TO BE MODIFIED to compile with FT 2.1 !! */ /* */ /*************************************************************************/ - #ifndef __FT2_BUILD_UNIX_H__ #define __FT2_BUILD_UNIX_H__ -#define FT2_PUBLIC_FILE( x ) -#define FT2_CONFIG_FILE( x ) -#define FT2_INTERNAL_FILE( x ) - -#include FT2_CONFIG_FILE( ftheader.h ) +/* "/usr/local/include/freetype2" must be in your current inclusion path */ +#include #endif /* __FT2_BUILD_UNIX_H__ */ diff --git a/builds/unix/install.mk b/builds/unix/install.mk index 840f39ce6..c38f88e24 100644 --- a/builds/unix/install.mk +++ b/builds/unix/install.mk @@ -51,6 +51,7 @@ uninstall: -$(DELETE) $(includedir)/freetype2/freetype/* -$(DELDIR) $(includedir)/freetype2/freetype -$(DELDIR) $(includedir)/freetype2 + -$(DELETE) $(includedir)/ft2build.h -$(DELETE) $(bindir)/freetype-config