[libpng15] Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.

Revised scripts/makefile.freebsd to respect ZLIBDIR and ZLIBINC.
This commit is contained in:
Glenn Randers-Pehrson
2013-02-22 20:54:27 -06:00
parent 6ec5e3ff67
commit ecfc22a681
4 changed files with 21 additions and 13 deletions

11
INSTALL
View File

@@ -46,15 +46,14 @@ to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed.
If you wish to test with a particular zlib that is not first in the
standard library search path, put ZLIBLIB, ZLIBINC, INCLUDES, LDFLAGS,
LIBS, and LD_LIBRARY_PATH in your environment before running "make test"
standard library search path, put ZLIBLIB, ZLIBINC, CPPFLAGS, LDFLAGS,
and LD_LIBRARY_PATH in your environment before running "make test"
or "make distcheck":
ZLIBLIB=/path/to/lib export ZLIBLIB
ZLIBINC=/path/to/include export ZLIBINC
INCLUDES="-I$ZLIBINC" export INCLUDES
CPPFLAGS="-I$ZLIBINC" export CPPFLAGS
LDFLAGS="-L$ZLIBLIB" export LDFLAGS
LIBS=$ZLIBLIB/libz.a export LIBS
LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH
If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC
@@ -67,8 +66,8 @@ If you want to use "cmake" (see www.cmake.org), type
make install
You can rename the directories that you downloaded (they
might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5"
or "zlib125") so that you have directories called "zlib" and "libpng".
might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.7"
or "zlib127") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this: