diff --git a/ANNOUNCE b/ANNOUNCE index 6ff1644f6..bb72cc825 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -744,6 +744,8 @@ version 1.4.0rc02 [December 22, 2009] Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c version 1.4.0rc03 [December 22, 2009] + Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt + (revising the change in 1.4.0beta99) Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 40b2f4919..87be5c6b8 100644 --- a/CHANGES +++ b/CHANGES @@ -2431,6 +2431,8 @@ version 1.4.0rc02 [December 22, 2009] Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c version 1.4.0rc03 [December 22, 2009] + Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt + (revising the change in 1.4.0beta99) Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 733704b9b..5d975a096 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,11 +191,11 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) -configure_file(${PNG_SOURCE_DIR}/libpng-pc.in +configure_file(${PNG_SOURCE_DIR}/libpng.pc.in ${PNG_BINARY_DIR}/libpng.pc) configure_file(${PNG_SOURCE_DIR}/libpng-config.in ${PNG_BINARY_DIR}/libpng-config) -configure_file(${PNG_SOURCE_DIR}/libpng-pc.in +configure_file(${PNG_SOURCE_DIR}/libpng.pc.in ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc) configure_file(${PNG_SOURCE_DIR}/libpng-config.in ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config) diff --git a/INSTALL b/INSTALL index f5944d69e..f67a215db 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 diff --git a/libpng-pc.in b/libpng.pc.in similarity index 100% rename from libpng-pc.in rename to libpng.pc.in