diff --git a/ChangeLog b/ChangeLog index 05421ef4c..c48fb806b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ +2002-01-08 David Turner + + * configure, install: added some wrapper scripts to make + the installation more Unix-friendly.. + + * INSTALL, README.UNX: updated installation documentation + to use the new 'configure' and 'install' scripts.. + + Oh my.., why didn't we do that before the 2.0.6 release :-) + + 2002-01-07 David Turner + * Version 2.0.6 released. + ========================= + * docs/BUGS, docs/CHANGES: updating documentation for 2.0.6 release * src/tools/docmaker.py: fixed HTML quoting in sources diff --git a/INSTALL b/INSTALL index 446c8c95f..cbd5d83e7 100644 --- a/INSTALL +++ b/INSTALL @@ -2,11 +2,31 @@ In order to build the library, read the `BUILD' document in the `docs' directory. This is only a quick starter. -I. From the command line +I. UNIX SYSTEMS: +---------------- + + Simply type: + + ./configure + make + ./install + + on the command line to configure, build and install FreeType + on your system. Note that the default installation path is + "/usr/local". + + Please read the file README.UNX, it contains _critical_ + information regarding the installation of FreeType on + many Unix systems. + + + + +II. From the command line ------------------------ - There are two ways to quickly build FreeType 2 from the command - line. + If you're not on Unix, there are two ways to quickly + build FreeType 2 from the command line. The first, and favorite one, is to use the "Jam" build tool. Jam is a highly portable replacement for Make whose control files do not @@ -40,7 +60,7 @@ I. From the command line jam In later releases of FT2, building shared libraries with Jam - should become automatic. + should become automatic on Unix systems.. 2. Building FT2 with "GNU Make" diff --git a/README.UNX b/README.UNX index 5b113dc1a..dffc960cb 100644 --- a/README.UNX +++ b/README.UNX @@ -50,9 +50,9 @@ SPECIAL NOTE FOR UNIX USERS Then, to build and install the library, type: - make setup unix CFG="--prefix=" + ./configure --prefix= make - make install (as root) + ./install (as root) where "" must be replaced by the prefix returned by the "freetype-config" command. diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac index c15f90323..7a0dc277e 100644 --- a/builds/unix/configure.ac +++ b/builds/unix/configure.ac @@ -86,6 +86,11 @@ dnl create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk' dnl and 'builds/unix/unix-cc.mk' that will be used by the build system dnl AC_CONFIG_FILES([unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config]) + +dnl re-generate the Jamfile to use libtool now +dnl +AC_CONFIG_FILE([../../Jamfile:../../Jamfile.in]) + AC_OUTPUT dnl end of configure.ac