From 76a64f4491ed5044923ce5145f35f846b191aafe Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sat, 14 Nov 2009 06:58:16 -0600
Subject: [PATCH] [devel] Revised CMakeLists.txt to account for new location of
 libpng-config.in

and libpng-pc.in
---
 ANNOUNCE       | 2 ++
 CHANGES        | 2 ++
 CMakeLists.txt | 8 ++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 4981131b3..3acb2fc56 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -676,6 +676,8 @@ version 1.4.0beta99 [November 14, 2009]
 version 1.4.0beta100 [November 14, 2009]
   Removed ASM builds from projects/visualc6 and projects/visualc71
   Removed scripts/makefile.nommx and makefile.vcawin32
+  Revised CMakeLists.txt to account for new location of libpng-config.in
+    and libpng-pc.in
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index d0d927139..7451bee42 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2363,6 +2363,8 @@ version 1.4.0beta99 [November 14, 2009]
 version 1.4.0beta100 [November 14, 2009]
   Removed ASM builds from projects/visualc6 and projects/visualc71
   Removed scripts/makefile.nommx and makefile.vcawin32
+  Revised CMakeLists.txt to account for new location of libpng-config.in
+    and libpng-pc.in
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45a04ffb5..cc0819ba2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,13 +191,13 @@ 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}/libpng-pc.in
   ${PNG_BINARY_DIR}/libpng.pc)
-configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
+configure_file(${PNG_SOURCE_DIR}/libpng-config.in
   ${PNG_BINARY_DIR}/libpng-config)
-configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in
+configure_file(${PNG_SOURCE_DIR}/libpng-pc.in
   ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc)
-configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
+configure_file(${PNG_SOURCE_DIR}/libpng-config.in
   ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config)
 
 # SET UP LINKS