Minor doc tweaks + ChangeLog update

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@951 632fc199-4ca6-4c93-a231-07263d6284db

BUILDING.txt

@@ -189,7 +189,8 @@ For example,
 will install the header files in /usr/local/include and the library files in
 /usr/local/lib64.  If 'prefix' and 'libdir' are not specified, then the default
 is to install the header files in /opt/libjpeg-turbo/include and the library
-files in /opt/libjpeg-turbo/lib.
+files in /opt/libjpeg-turbo/lib32 (32-bit) or /opt/libjpeg-turbo/lib64
+(64-bit.)
 
 NOTE: You can specify a prefix of /usr and a libdir of, for instance,
 /usr/lib64 to overwrite the system's version of libjpeg.  If you do this,
@@ -676,8 +677,8 @@ MinGW Build on Linux
 The following commands can be used to create various types of release packages:
 
 
-Unix
-----
+Unix/Linux
+----------
 
 make rpm
 

ChangeLog.txt

@@ -4,18 +4,29 @@
 [1] 'make test' now works properly on FreeBSD, and it no longer requires the
 md5sum executable to be present on other Un*x platforms.
 
-[2] Overhauled the Linux/Unix packaging system:
+[2] Overhauled the packaging system:
 -- To avoid conflict with vendor-supplied libjpeg-turbo packages, the
 official RPMs and DEBs for libjpeg-turbo have been renamed to
-"libjpeg-turbo-official", and the TurboJPEG libraries are now packaged under
-/opt/libjpeg-turbo in the official packages.
--- DEB and RPM packages are now created properly whenever the prefix is set
-to a non-default value (such as /usr/local.)
+"libjpeg-turbo-official".
+-- The TurboJPEG libraries are now located under /opt/libjpeg-turbo in the
+official Linux and Mac packages, to avoid conflict with vendor-supplied
+packages and also to streamline the packaging system.
+-- Release packages are now created with the directory structure defined
+by the configure variables "prefix", "bindir", "libdir", etc. (Un*x) or by the
+CMAKE_INSTALL_PREFIX variable (Windows.)  The exception is that the docs are
+always located under the system default documentation directory on Un*x and Mac
+systems, and on Windows, the TurboJPEG DLL is always located in the Windows
+system directory.
 -- To avoid confusion, official libjpeg-turbo packages on Linux/Unix platforms
 (except for Mac) will always install the 32-bit libraries in
 /opt/libjpeg-turbo/lib32 and the 64-bit libraries in /opt/libjpeg-turbo/lib64.
--- Fixed an issue whereby, in some cases, the libjpeg-turbo executables were
-not properly linking with the shared libraries installed by the same package.
+-- Fixed an issue whereby, in some cases, the libjpeg-turbo executables on Un*x
+systems were not properly linking with the shared libraries installed by the
+same package.
+-- Fixed an issue whereby building the "installer" target on Windows when
+WITH_JAVA=1 would fail if the TurboJPEG JAR had not been previously built.
+-- Building the "install" target on Windows now installs files into the same
+places that the installer does.
 
 
 1.2.90 (1.3 beta1)

java/README

@@ -39,8 +39,8 @@ Installation Directory
 
 The TurboJPEG Java Wrapper will look for the TurboJPEG JNI library
 (libturbojpeg.so, libturbojpeg.jnilib, or turbojpeg.dll) in the system library
-paths or in any paths specified in LD_LIBRARY_PATH (Unix), DYLD_LIBRARY_PATH
-(Mac), or PATH (Windows.)  Failing this, on Unix and Mac systems, the wrapper
+paths or in any paths specified in LD_LIBRARY_PATH (Un*x), DYLD_LIBRARY_PATH
+(Mac), or PATH (Windows.)  Failing this, on Un*x and Mac systems, the wrapper
 will look for the JNI library under the library directory configured when
 libjpeg-turbo was built.  If that library directory is
 /opt/libjpeg-turbo/lib32, then /opt/libjpeg-turbo/lib64 is also searched, and