diff --git a/ANNOUNCE b/ANNOUNCE index 4981131b3ea1b3fe27f629361bdca416e0512f7f..3acb2fc562207718723e36b1d518fc22db91833e 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 d0d92713937473e6d9136cdb8ebc3cdaf423e003..7451bee427c58c1b4f768e89437a709d7bc1d52a 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 45a04ffb5e6d37fcba0a892c9648c5c0a6033ca4..cc0819ba2925aad975f453f189fa16bd06c276c3 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