Commit bbf33f304ad81edabacfe233bde1462ca43703d4
2001-03-24T00:42:45
small Unix installation update
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/builds/unix/ft2unix.h b/builds/unix/ft2unix.h
index 06f7284..0099f09 100644
--- a/builds/unix/ft2unix.h
+++ b/builds/unix/ft2unix.h
@@ -21,20 +21,37 @@
/* This is a Unix-specific version of <ft2build.h> 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 <freetype2/config/ftheader.h>, instead */
+ /* of <freetype/config/ftheader.h> */
+ /* */
+ /* - the content of "ftheader.h" will be processed through sed to */
+ /* replace all "<freetype/xxx>" with "<freetype2/xxxx>" */
+ /* */
+ /* - 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 ) <freetype2/freetype/ ## x ## >
-#define FT2_CONFIG_FILE( x ) <freetype2/freetype/config/ ## x ## >
-#define FT2_INTERNAL_FILE( x ) <freetype2/freetype/internal/ ## x ## >
-
-#include FT2_CONFIG_FILE( ftheader.h )
+/* "/usr/local/include/freetype2" must be in your current inclusion path */
+#include <freetype/config/ftheader.h>
#endif /* __FT2_BUILD_UNIX_H__ */
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index 840f39c..c38f88e 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