summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDel Merritt <del@alum.mit.edu>2012-11-30 15:29:33 +0100
committerWerner Lemberg <wl@gnu.org>2012-11-30 15:29:33 +0100
commit74e6a1f26f4f4c65e05352fcdf12fc3e0a4705ff (patch)
tree0b9531b1c9eb31b0526b18048377883c6ac3f452
parentb731c8274aefff511f8b39b132ff091fb92805f7 (diff)
downloadfreetype2-74e6a1f26f4f4c65e05352fcdf12fc3e0a4705ff.tar.gz
[doc] Minor improvements.
-rw-r--r--docs/CUSTOMIZE17
-rw-r--r--docs/INSTALL.CROSS6
2 files changed, 14 insertions, 9 deletions
diff --git a/docs/CUSTOMIZE b/docs/CUSTOMIZE
index 7d7d474ec..396eda38e 100644
--- a/docs/CUSTOMIZE
+++ b/docs/CUSTOMIZE
@@ -31,6 +31,10 @@ II. Modules list
make uses `modules.cfg' to generate `ftmodule.h' (in the object
directory).
+ If you build FreeType in a directory separate from the source files,
+ put your customized `modules.cfg' in that directory; that way you
+ can keep the source files `clean'.
+
If you don't use GNU make you have to manually edit the file
`include/freetype/config/ftmodule.h' (which is *not* used with if
compiled with GNU make) to add or remove the drivers and components
@@ -77,11 +81,12 @@ IV. Overriding default configuration and module headers
[This is actually a combination of method 2 and 3.]
- Just put your custom `ftoption.h' file into the objects directory
- (normally `<topdir>/objs'), which GNU make prefers over the
- standard location. No action is needed for `ftmodule.h' because
- it is generated automatically in the objects directory.
-
+ Just put your custom `ftoption.h' file into the objects directory
+ (normally `<topdir>/objs' if you build in the source tree, or the
+ directory where you invoke configure if you build in a separate
+ directory), which GNU make prefers over the standard location. No
+ action is needed for `ftmodule.h' because it is generated
+ automatically in the objects directory.
2. Using the C include path
@@ -137,7 +142,7 @@ IV. Overriding default configuration and module headers
----------------------------------------------------------------------
-Copyright 2003, 2005, 2006 by
+Copyright 2003, 2005, 2006, 2012 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/docs/INSTALL.CROSS b/docs/INSTALL.CROSS
index 3def12c8c..005d44293 100644
--- a/docs/INSTALL.CROSS
+++ b/docs/INSTALL.CROSS
@@ -44,11 +44,11 @@ INSTALL.UNIX for required tools and the basic self-building procedure.
the option pair `--host=' and `--target='. This is broken and
doesn't work. Similarly, an explicit CC specification like
- env CC=mips-ip22-linux-gcc ./configure
+ env CC=mips-ip22-linux-gcc ./configure # BAD
or
- env CC=/usr/local/mips-ip22-linux/bin/gcc ./configure
+ env CC=/usr/local/mips-ip22-linux/bin/gcc ./configure # BAD
doesn't work either; such a configuration confuses the
`configure' script while trying to find the cross and native C
@@ -121,7 +121,7 @@ INSTALL.UNIX for required tools and the basic self-building procedure.
----------------------------------------------------------------------
-Copyright 2006, 2008 by suzuki toshiya
+Copyright 2006, 2008, 2012 by suzuki toshiya
David Turner, Robert Wilhelm, and Werner Lemberg.