Commit 82a07e93789aefc149df7b91fa01a90835530328

Werner Lemberg 2006-10-12T06:20:44

* docs/INSTALL.UNX, docs/UPGRADE.UNX: Renamed to... * docs/INSTALL.UNIX, docs/UPGRADE.UNIX: This. Update all documents which reference those files.

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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
diff --git a/ChangeLog b/ChangeLog
index ca302fc..ed029ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-12  Werner Lemberg  <wl@gnu.org>
+
+	* docs/INSTALL.UNX, docs/UPGRADE.UNX: Renamed to...
+	* docs/INSTALL.UNIX, docs/UPGRADE.UNIX: This.  Update all documents
+	which reference those files.
+
 2006-10-12  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* builds/unix/configure.raw: Introduce new macro to embed optional
diff --git a/README b/README
index d38bce0..0116c3d 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
   Special notes to Unix users
   ===========================
 
-  Please  read  the file  `docs/UPGRADE.UNX'.   It contains  important
+  Please  read  the file  `docs/UPGRADE.UNIX'.  It contains  important
   information regarding the installation  of FreeType on Unix systems,
   especially GNU based operating systems like GNU/Linux.
 
diff --git a/docs/INSTALL b/docs/INSTALL
index 98ca4c4..11e2fc7 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -15,7 +15,7 @@ I. Normal installation and upgrades
 
   2. Unix Systems (as well as Cygwin or MSys on Windows)
 
-    Please read  *both* `UPGRADE.UNX' and `INSTALL.UNX'  to install or
+    Please read *both* `UPGRADE.UNIX' and `INSTALL.UNIX' to install or
     upgrade FreeType  2 on  a Unix system.   Note that you  *need* GNU
     Make for automatic compilation,  since other make tools won't work
     (this includes BSD Make).
diff --git a/docs/INSTALL.GNU b/docs/INSTALL.GNU
index 3859eee..d52f03a 100644
--- a/docs/INSTALL.GNU
+++ b/docs/INSTALL.GNU
@@ -1,7 +1,7 @@
 This document contains instructions  how to build the FreeType library
 on non-Unix systems  with the help of GNU Make.  Note  that if you are
 running Cygwin or MSys in  Windows, you should follow the instructions
-in the file INSTALL.UNX instead.
+in the file INSTALL.UNIX instead.
 
 
   FreeType 2 includes a powerful and flexible build system that allows
diff --git a/docs/INSTALL.UNIX b/docs/INSTALL.UNIX
new file mode 100644
index 0000000..aa7d67c
--- /dev/null
+++ b/docs/INSTALL.UNIX
@@ -0,0 +1,79 @@
+This  document contains  instructions  on how  to  build the  FreeType
+library on Unix  systems.  This also works for  emulations like Cygwin
+or MSys on Win32:
+
+
+  1. Ensure that you are using GNU Make
+  -------------------------------------
+
+    The FreeType build system  _exclusively_ works with GNU Make.  You
+    will  not be  able to  compile the  library with  the instructions
+    below using any other alternative (including BSD Make).
+
+    [Well,  this  is not  really  correct.  A  few  years  ago a  perl
+    implementation of make called `makepp' has appeared which can also
+    build FreeType 2 successfully on Unix platforms.  See
+
+      http://makepp.sourceforge.net
+
+    for more  details; you  need version 1.19  or newer, and  you must
+    pass option `--norc-substitution'.]
+
+    Trying  to compile  the library  with a  different Make  tool will
+    print a message like:
+
+      Sorry, GNU make is required to build FreeType2.
+
+    and the build  process will be aborted.  If  this happens, install
+    GNU Make on your system,  and use the GNUMAKE environment variable
+    to name it, if necessary.
+
+
+  2. Build and install the library
+  --------------------------------
+
+    The following  should work  on all Unix  systems where  the `make'
+    command invokes GNU Make:
+
+      ./configure [options]
+      make
+      make install           (as root)
+
+    The default installation path  is `/usr/local'.  It can be changed
+    with the `--prefix=<path>' option.  Example:
+
+      ./configure --prefix=/usr
+
+    When using a different command to invoke GNU Make, use the GNUMAKE
+    variable.  For example,  if `gmake' is the command  to use on your
+    system, do something like:
+
+       GNUMAKE=gmake ./configure [options]
+       gmake
+       gmake install            (as root)
+
+    If  this still doesn't  work, there  must be  a problem  with your
+    system (e.g., you are using a very old version of GNU Make).
+
+    It  is possible  to  compile FreeType  in  a different  directory.
+    Assuming the FreeType source  files in directory `/src/freetype' a
+    compilation in directory `foo' works as follows:
+
+      cd foo
+      /src/freetype/configure [options]
+      make
+      make install
+
+----------------------------------------------------------------------
+
+Copyright 2003, 2004, 2005, 2006 by
+David Turner, Robert Wilhelm, and Werner Lemberg.
+
+This  file is  part of  the FreeType  project, and  may only  be used,
+modified,  and distributed  under the  terms of  the  FreeType project
+license,  LICENSE.TXT.  By  continuing to  use, modify,  or distribute
+this file you  indicate that you have read  the license and understand
+and accept it fully.
+
+
+--- end of INSTALL.UNIX ---
diff --git a/docs/INSTALL.UNX b/docs/INSTALL.UNX
deleted file mode 100644
index 13cb896..0000000
--- a/docs/INSTALL.UNX
+++ /dev/null
@@ -1,79 +0,0 @@
-This  document contains  instructions  on how  to  build the  FreeType
-library on Unix  systems.  This also works for  emulations like Cygwin
-or MSys on Win32:
-
-
-  1. Ensure that you are using GNU Make
-  -------------------------------------
-
-    The FreeType build system  _exclusively_ works with GNU Make.  You
-    will  not be  able to  compile the  library with  the instructions
-    below using any other alternative (including BSD Make).
-
-    [Well,  this  is not  really  correct.  A  few  years  ago a  perl
-    implementation of make called `makepp' has appeared which can also
-    build FreeType 2 successfully on Unix platforms.  See
-
-      http://makepp.sourceforge.net
-
-    for more  details; you  need version 1.19  or newer, and  you must
-    pass option `--norc-substitution'.]
-
-    Trying  to compile  the library  with a  different Make  tool will
-    print a message like:
-
-      Sorry, GNU make is required to build FreeType2.
-
-    and the build  process will be aborted.  If  this happens, install
-    GNU Make on your system,  and use the GNUMAKE environment variable
-    to name it, if necessary.
-
-
-  2. Build and install the library
-  --------------------------------
-
-    The following  should work  on all Unix  systems where  the `make'
-    command invokes GNU Make:
-
-      ./configure [options]
-      make
-      make install           (as root)
-
-    The default installation path  is `/usr/local'.  It can be changed
-    with the `--prefix=<path>' option.  Example:
-
-      ./configure --prefix=/usr
-
-    When using a different command to invoke GNU Make, use the GNUMAKE
-    variable.  For example,  if `gmake' is the command  to use on your
-    system, do something like:
-
-       GNUMAKE=gmake ./configure [options]
-       gmake
-       gmake install            (as root)
-
-    If  this still doesn't  work, there  must be  a problem  with your
-    system (e.g., you are using a very old version of GNU Make).
-
-    It  is possible  to  compile FreeType  in  a different  directory.
-    Assuming the FreeType source  files in directory `/src/freetype' a
-    compilation in directory `foo' works as follows:
-
-      cd foo
-      /src/freetype/configure [options]
-      make
-      make install
-
-----------------------------------------------------------------------
-
-Copyright 2003, 2004, 2005, 2006 by
-David Turner, Robert Wilhelm, and Werner Lemberg.
-
-This  file is  part of  the FreeType  project, and  may only  be used,
-modified,  and distributed  under the  terms of  the  FreeType project
-license,  LICENSE.TXT.  By  continuing to  use, modify,  or distribute
-this file you  indicate that you have read  the license and understand
-and accept it fully.
-
-
---- end of INSTALL.UNX ---
diff --git a/docs/UPGRADE.UNIX b/docs/UPGRADE.UNIX
new file mode 100644
index 0000000..23891b5
--- /dev/null
+++ b/docs/UPGRADE.UNIX
@@ -0,0 +1,137 @@
+
+SPECIAL NOTE FOR UNIX USERS
+===========================
+
+  If  you are  installing  this release  of  FreeType on  a system  that
+  already uses  release 2.0.5  (or even an  older version), you  have to
+  perform a few special steps to ensure that everything goes well.
+
+
+  1. Enable the TrueType bytecode hinter if you need it
+  -----------------------------------------------------
+
+    See the instructions in the file `TRUETYPE' of this directory.
+   
+    Note  that FreeType  supports  TrueType fonts  without the  bytecode
+    interpreter through its  auto-hinter, which now generates relatively
+    good results with most fonts.
+
+
+  2. Determine the correct installation path
+  ------------------------------------------
+
+    By   default,  the   configure  script   installs  the   library  in
+    `/usr/local'.   However,  many Unix  distributions  now install  the
+    library  in `/usr',  since FreeType  is becoming  a  critical system
+    component.
+
+    If FreeType is already installed on your system, type
+
+      freetype-config --prefix
+
+    on  the command  line.   This should  return  the installation  path
+    (e.g.,  `/usr'  or `/usr/local').   To  avoid  problems of  parallel
+    FreeType  versions, use  this path  for the  --prefix option  of the
+    configure script.
+
+    Otherwise, simply use `/usr' (or  whatever you think is adequate for
+    your installation).
+
+
+  3. Ensure that you are using GNU Make
+  -------------------------------------
+
+    The FreeType build  system _exclusively_ works with GNU  Make (as an
+    exception you  can use make++ which emulates  GNU Make sufficiently;
+    see http://makepp.sourceforge.net).  You will not be able to compile
+    the library with the  instructions below using any other alternative
+    (including BSD Make).
+
+    Trying to  compile the library with  a different Make  tool prints a
+    message like:
+
+      Sorry, GNU make is required to build FreeType2.
+
+    and the build process is aborted.  If this happens, install GNU Make
+    on your system, and use the GNUMAKE environment variable to name it.
+
+
+  4. Build and install the library
+  --------------------------------
+
+    The  following should  work on  all  Unix systems  where the  `make'
+    command invokes GNU Make:
+
+      ./configure --prefix=<yourprefix>
+      make
+      make install           (as root)
+
+    where `<yourprefix>' must be replaced  by the prefix returned by the
+    `freetype-config' command.
+
+    When using a  different command to invoke GNU  Make, use the GNUMAKE
+    variable.  For  example, if  `gmake' is the  command to use  on your
+    system, do something like:
+
+      GNUMAKE=gmake ./configure --prefix=<yourprefix>
+      gmake
+      gmake install            (as root)
+
+
+  5. Take care of XFree86 version 4
+  ---------------------------------
+
+    Certain Linux  distributions install _several_  versions of FreeType
+    on your  system.  For example, on  a fresh Mandrake  8.1 system, you
+    can find the following files:
+
+      /usr/lib/libfreetype.so             which links to
+      /usr/lib/libfreetype.6.1.0.so
+
+    and
+
+      /usr/X11R6/lib/libfreetype.so       which links to
+      /usr/X11R6/lib/libfreetype.6.0.so
+
+    Note that  these files  correspond to two  distinct versions  of the
+    library!  It seems that this  surprising issue is due to the install
+    scripts of  recent XFree86 servers (from 4.1.0)  which install their
+    own (dated) version of the library in `/usr/X11R6/lib'.
+
+    In certain  _rare_ cases  you may experience  minor problems  if you
+    install this  release of  the library in  `/usr' only,  namely, that
+    certain applications do not benefit from the bug fixes and rendering
+    improvements you would expect.
+
+    There are two good ways to deal with this situation:
+
+      - Install the library _twice_,  in `/usr' and in `/usr/X11R6' (you
+        have to  do that  each time you  install a new  FreeType release
+        though).
+
+      - Change the link in /usr/X11R6/lib/libfreetype.so to point to
+
+          /usr/lib/libfreetype.so,
+
+        and get rid of
+
+          /usr/X11R6/lib/libfreetype.6.0.so
+
+    The FreeType  Team is  not responsible for  this problem,  so please
+    contact  either   the  XFree86   development  team  or   your  Linux
+    distributor to help  clear this issue in case  the information given
+    here doesn't help.
+
+------------------------------------------------------------------------
+
+Copyright 2003, 2005 by
+David Turner, Robert Wilhelm, and Werner Lemberg.
+
+This  file is  part  of the  FreeType  project, and  may  only be  used,
+modified,  and  distributed under  the  terms  of  the FreeType  project
+license, LICENSE.TXT.  By continuing  to use, modify, or distribute this
+file  you indicate that  you have  read the  license and  understand and
+accept it fully.
+
+
+---- end of UPGRADE.UNIX ---
diff --git a/docs/UPGRADE.UNX b/docs/UPGRADE.UNX
deleted file mode 100644
index de1b35b..0000000
--- a/docs/UPGRADE.UNX
+++ /dev/null
@@ -1,137 +0,0 @@
-
-SPECIAL NOTE FOR UNIX USERS
-===========================
-
-  If  you are  installing  this release  of  FreeType on  a system  that
-  already uses  release 2.0.5  (or even an  older version), you  have to
-  perform a few special steps to ensure that everything goes well.
-
-
-  1. Enable the TrueType bytecode hinter if you need it
-  -----------------------------------------------------
-
-    See the instructions in the file `TRUETYPE' of this directory.
-   
-    Note  that FreeType  supports  TrueType fonts  without the  bytecode
-    interpreter through its  auto-hinter, which now generates relatively
-    good results with most fonts.
-
-
-  2. Determine the correct installation path
-  ------------------------------------------
-
-    By   default,  the   configure  script   installs  the   library  in
-    `/usr/local'.   However,  many Unix  distributions  now install  the
-    library  in `/usr',  since FreeType  is becoming  a  critical system
-    component.
-
-    If FreeType is already installed on your system, type
-
-      freetype-config --prefix
-
-    on  the command  line.   This should  return  the installation  path
-    (e.g.,  `/usr'  or `/usr/local').   To  avoid  problems of  parallel
-    FreeType  versions, use  this path  for the  --prefix option  of the
-    configure script.
-
-    Otherwise, simply use `/usr' (or  whatever you think is adequate for
-    your installation).
-
-
-  3. Ensure that you are using GNU Make
-  -------------------------------------
-
-    The FreeType build  system _exclusively_ works with GNU  Make (as an
-    exception you  can use make++ which emulates  GNU Make sufficiently;
-    see http://makepp.sourceforge.net).  You will not be able to compile
-    the library with the  instructions below using any other alternative
-    (including BSD Make).
-
-    Trying to  compile the library with  a different Make  tool prints a
-    message like:
-
-      Sorry, GNU make is required to build FreeType2.
-
-    and the build process is aborted.  If this happens, install GNU Make
-    on your system, and use the GNUMAKE environment variable to name it.
-
-
-  4. Build and install the library
-  --------------------------------
-
-    The  following should  work on  all  Unix systems  where the  `make'
-    command invokes GNU Make:
-
-      ./configure --prefix=<yourprefix>
-      make
-      make install           (as root)
-
-    where `<yourprefix>' must be replaced  by the prefix returned by the
-    `freetype-config' command.
-
-    When using a  different command to invoke GNU  Make, use the GNUMAKE
-    variable.  For  example, if  `gmake' is the  command to use  on your
-    system, do something like:
-
-      GNUMAKE=gmake ./configure --prefix=<yourprefix>
-      gmake
-      gmake install            (as root)
-
-
-  5. Take care of XFree86 version 4
-  ---------------------------------
-
-    Certain Linux  distributions install _several_  versions of FreeType
-    on your  system.  For example, on  a fresh Mandrake  8.1 system, you
-    can find the following files:
-
-      /usr/lib/libfreetype.so             which links to
-      /usr/lib/libfreetype.6.1.0.so
-
-    and
-
-      /usr/X11R6/lib/libfreetype.so       which links to
-      /usr/X11R6/lib/libfreetype.6.0.so
-
-    Note that  these files  correspond to two  distinct versions  of the
-    library!  It seems that this  surprising issue is due to the install
-    scripts of  recent XFree86 servers (from 4.1.0)  which install their
-    own (dated) version of the library in `/usr/X11R6/lib'.
-
-    In certain  _rare_ cases  you may experience  minor problems  if you
-    install this  release of  the library in  `/usr' only,  namely, that
-    certain applications do not benefit from the bug fixes and rendering
-    improvements you would expect.
-
-    There are two good ways to deal with this situation:
-
-      - Install the library _twice_,  in `/usr' and in `/usr/X11R6' (you
-        have to  do that  each time you  install a new  FreeType release
-        though).
-
-      - Change the link in /usr/X11R6/lib/libfreetype.so to point to
-
-          /usr/lib/libfreetype.so,
-
-        and get rid of
-
-          /usr/X11R6/lib/libfreetype.6.0.so
-
-    The FreeType  Team is  not responsible for  this problem,  so please
-    contact  either   the  XFree86   development  team  or   your  Linux
-    distributor to help  clear this issue in case  the information given
-    here doesn't help.
-
-------------------------------------------------------------------------
-
-Copyright 2003, 2005 by
-David Turner, Robert Wilhelm, and Werner Lemberg.
-
-This  file is  part  of the  FreeType  project, and  may  only be  used,
-modified,  and  distributed under  the  terms  of  the FreeType  project
-license, LICENSE.TXT.  By continuing  to use, modify, or distribute this
-file  you indicate that  you have  read the  license and  understand and
-accept it fully.
-
-
----- end of UPGRADE.UNX ---