[master] Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt

    (revising changes made in 1.2.41beta17 and 1.2.41rc01)

4 files changed, 11 insertions, 6 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 17e2c721f..fc8937734 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -58,10 +58,13 @@ version 1.2.42beta02 [December 11, 2009]
     change in version 1.2.41beta08 caused transparency to be handled wrong
     in some 16-bit datastreams (Yusaku Sugai).
 
-version 1.2.42rc01 [December 19, 2009]
+version 1.2.42rc01 [December 17, 2009]
   No changes.
 
 version 1.2.42rc02 [December 22, 2009]
+  Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt
+    (revising changes made in 1.2.41beta17 and 1.2.41rc01)
+
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 
diff --git a/CHANGES b/CHANGES
index d9dc21ca0..a3b0e8efc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2602,7 +2602,7 @@ version 1.2.41rc03 [November 25, 2009]
   Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files.
   Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects.
 
-version 1.2.41 [December 3, 2009]
+version 1.2.41 and 1.0.51 [December 3, 2009]
   Updated the list of files and made some cosmetic changes in README.
 
 version 1.2.42beta01 [December 4, 2009]
@@ -2621,10 +2621,12 @@ version 1.2.42beta02 [December 11, 2009]
     change in version 1.2.41beta08 caused transparency to be handled wrong
     in some 16-bit datastreams (Yusaku Sugai).
 
-version 1.2.42rc01 [December 19, 2009]
+version 1.2.42rc01 [December 17, 2009]
   No changes.
 
 version 1.2.42rc02 [December 22, 2009]
+  Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt
+    (revising changes made in 1.2.41beta17 and 1.2.41rc01)
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8070988e3..a33716ee3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,11 +193,11 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX})
 set(libdir      ${CMAKE_INSTALL_PREFIX}/lib)
 set(includedir  ${CMAKE_INSTALL_PREFIX}/include)
 
-configure_file(${PNG_SOURCE_DIR}/scripts/libpng-pc.in
+configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in
   ${PNG_BINARY_DIR}/libpng.pc)
 configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
   ${PNG_BINARY_DIR}/libpng-config)
-configure_file(${PNG_SOURCE_DIR}/scripts/libpng-pc.in
+configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in
   ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc)
 configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
   ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config)
diff --git a/INSTALL b/INSTALL
index 52a12cc14..b5b541722 100644
--- a/INSTALL
+++ b/INSTALL
@@ -62,7 +62,7 @@ Your directory structure should look like this:
              configure.ac, configure, Makefile.am, Makefile.in,
 %12-%             autogen.sh, config.guess, ltmain.sh, missing,
 %12-%             aclocal.m4, config.h.in, config.sub,
-%14+%             autogen.sh, config.guess, ltmain.sh, missing, libpng-pc.in,
+%14+%             autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in,
 %14+%             libpng-config.in, aclocal.m4, config.h.in, config.sub,
              depcomp, install-sh, mkinstalldirs, test-pngtest.sh
           contrib