From 66676016f625bf9fe59ef6f1fe2d2f6b0d924ef9 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 16 Oct 2010 07:18:09 -0500 Subject: [PATCH] [devel] Updated INSTALL to mention using "make maintainer-clean" and to remove obsolete statement about a custom ltmain.sh --- ANNOUNCE | 2 ++ CHANGES | 2 ++ INSTALL | 25 +++++++++++++------------ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 75b6988cc..12d2a1cbd 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -422,6 +422,8 @@ Version 1.5.0beta52 [October 16, 2010] Restored some of the embedded dates (in png.h, png.c, documentation, etc.) Version 1.5.0beta53 [October 16, 2010] + Updated INSTALL to mention using "make maintainer-clean" and to remove + obsolete statement about a custom ltmain.sh Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index 0cabf6f4b..e84dccb3f 100644 --- a/CHANGES +++ b/CHANGES @@ -3060,6 +3060,8 @@ Version 1.5.0beta52 [October 16, 2010] Restored some of the embedded dates (in png.h, png.c, documentation, etc.) Version 1.5.0beta53 [October 16, 2010] + Updated INSTALL to mention using "make maintainer-clean" and to remove + obsolete statement about a custom ltmain.sh Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index d76fb85ff..a50293d04 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.5.0beta53 - October 16, 2010 +Installing libpng On Unix/Linux and similar systems, you can simply type @@ -13,10 +13,15 @@ If configure does not work on your system and you have a reasonably up-to-date set of tools, running ./autogen.sh before running ./configure may fix the problem. You can also run the individual commands in autogen.sh with the --force option, if supported by your version of -the tools. If you run 'libtoolize --force', though, this will replace -the distributed, patched, version of ltmain.sh with an unpatched version -and your shared library builds may fail to produce libraries with the -correct version numbers. +the tools. To be really sure that you aren't using any of the included +pre-built scripts, you can do this: + + ../configure --enable-maintainer-mode + make maintainer-clean + ../configure [--prefix=/path] [other options] + make + make install + make check Instead, you can use one of the custom-built makefiles in the "scripts" directory @@ -46,8 +51,8 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.5.0beta53" or "libpng15" and "zlib-1.2.3" -or "zlib123") so that you have directories called "zlib" and "libpng". +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". Your directory structure should look like this: @@ -60,8 +65,6 @@ Your directory structure should look like this: CMakeLists.txt => "cmake" script configuration files: configure.ac, configure, Makefile.am, Makefile.in, - autogen.sh, config.guess, ltmain.sh, missing, - aclocal.m4, config.h.in, config.sub, autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in, libpng-config.in, aclocal.m4, config.h.in, config.sub, depcomp, install-sh, mkinstalldirs, test-pngtest.sh @@ -72,10 +75,8 @@ Your directory structure should look like this: pngsuite visupng projects - cbuilder5 (Borland) - visualc6 (msvc) visualc71 - xcode + vstudio scripts makefile.* *.def (module definition files)