Commit ce9a0441ad2f0508649251373ceedb1b01f97b22
2002-01-08T18:33:55
added 'configure' and 'install' wrapper scripts to make the installation process more Unix-friendly :-)
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
diff --git a/ChangeLog b/ChangeLog
index 05421ef..c48fb80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
+2002-01-08 David Turner <david@freetype.org>
+
+ * 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 <david@freetype.org>
+ * 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 446c8c9..cbd5d83 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 5b113dc..dffc960 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=<yourprefix>"
+ ./configure --prefix=<yourprefix>
make
- make install (as root)
+ ./install (as root)
where "<yourprefix>" 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 c15f903..7a0dc27 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