[libpng16] Minor editing of INSTALL, (whitespace, added copyright line)

This commit is contained in:
Glenn Randers-Pehrson 2016-08-17 06:39:26 -05:00
parent 39df0ced18
commit 9cab7a24fd
3 changed files with 33 additions and 19 deletions

View File

@ -1,4 +1,4 @@
Libpng 1.6.25beta02 - August 14, 2016 Libpng 1.6.25beta02 - August 17, 2016
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -30,8 +30,9 @@ Version 1.6.25beta01 [August 12, 2016]
Cleaned up PNG_DEBUG compile of pngtest.c. Cleaned up PNG_DEBUG compile of pngtest.c.
Conditionally compile png_inflate(). Conditionally compile png_inflate().
Version 1.6.25beta02 [August 14, 2016] Version 1.6.25beta02 [August 17, 2016]
Don't install pngcp; it conflicts with pngcp in the pngtools package. Don't install pngcp; it conflicts with pngcp in the pngtools package.
Minor editing of INSTALL, (whitespace, added copyright line)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -5680,8 +5680,9 @@ Version 1.6.25beta01 [August 12, 2016]
Cleaned up PNG_DEBUG compile of pngtest.c. Cleaned up PNG_DEBUG compile of pngtest.c.
Conditionally compile png_inflate(). Conditionally compile png_inflate().
Version 1.6.25beta02 [August 14, 2016] Version 1.6.25beta02 [August 17, 2016]
Don't install pngcp; it conflicts with pngcp in the pngtools package. Don't install pngcp; it conflicts with pngcp in the pngtools package.
Minor editing of INSTALL, (whitespace, added copyright line)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

44
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng Installing libpng
Contents Contents
@ -90,22 +90,24 @@ standard library search path, put ZLIBLIB, ZLIBINC, CPPFLAGS, LDFLAGS,
and LD_LIBRARY_PATH in your environment before running "make test" and LD_LIBRARY_PATH in your environment before running "make test"
or "make distcheck": or "make distcheck":
ZLIBLIB=/path/to/lib export ZLIBLIB ZLIBLIB=/path/to/lib export ZLIBLIB
ZLIBINC=/path/to/include export ZLIBINC ZLIBINC=/path/to/include export ZLIBINC
CPPFLAGS="-I$ZLIBINC" export CPPFLAGS CPPFLAGS="-I$ZLIBINC" export CPPFLAGS
LDFLAGS="-L$ZLIBLIB" export LDFLAGS LDFLAGS="-L$ZLIBLIB" export LDFLAGS
LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH
If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC
in your environment and type "make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test". in your environment and type
make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test
IV. Using cmake IV. Using cmake
If you want to use "cmake" (see www.cmake.org), type If you want to use "cmake" (see www.cmake.org), type
cmake . -DCMAKE_INSTALL_PREFIX=/path cmake . -DCMAKE_INSTALL_PREFIX=/path
make make
make install make install
As when using the simple configure method described above, "/path" points to As when using the simple configure method described above, "/path" points to
the installation directory where you want to put the libpng "lib", "include", the installation directory where you want to put the libpng "lib", "include",
@ -119,7 +121,7 @@ or "zlib128") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this: Your directory structure should look like this:
.. (the parent directory) .. (the parent directory)
libpng (this directory) libpng (this directory)
INSTALL (this file) INSTALL (this file)
README README
@ -163,10 +165,15 @@ VII. Building with makefiles
Copy the file (or files) that you need from the Copy the file (or files) that you need from the
scripts directory into this directory, for example scripts directory into this directory, for example
MSDOS example: copy scripts\makefile.msc makefile MSDOS example:
copy scripts\pnglibconf.h.prebuilt pnglibconf.h
UNIX example: cp scripts/makefile.std makefile copy scripts\makefile.msc makefile
cp scripts/pnglibconf.h.prebuilt pnglibconf.h copy scripts\pnglibconf.h.prebuilt pnglibconf.h
UNIX example:
cp scripts/makefile.std makefile
cp scripts/pnglibconf.h.prebuilt pnglibconf.h
Read the makefile to see if you need to change any source or Read the makefile to see if you need to change any source or
target directories to match your preferences. target directories to match your preferences.
@ -374,7 +381,7 @@ your application is going to be using multiple threads, you should
configure libpng with PNG_NO_SETJMP in your pngusr.dfa file, with configure libpng with PNG_NO_SETJMP in your pngusr.dfa file, with
-DPNG_NO_SETJMP on your compile line, or with -DPNG_NO_SETJMP on your compile line, or with
#undef PNG_SETJMP_SUPPORTED #undef PNG_SETJMP_SUPPORTED
in your pnglibconf.h or pngusr.h. in your pnglibconf.h or pngusr.h.
@ -400,3 +407,8 @@ XVII. Other sources of information about libpng:
Further information can be found in the README and libpng-manual.txt Further information can be found in the README and libpng-manual.txt
files, in the individual makefiles, in png.h, and the manual pages files, in the individual makefiles, in png.h, and the manual pages
libpng.3 and png.5. libpng.3 and png.5.
Copyright (c) 1998-2002,2006-2016 Glenn Randers-Pehrson
This document is released under the libpng license.
For conditions of distribution and use, see the disclaimer
and license in png.h.