From 547afcfc746883dc1f1617f68571b13fa24a74e0 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 21 Aug 2010 18:36:29 -0500 Subject: [PATCH] [master] Revised CMakeLists.txt to put the man pages in share/man/man* not in man/man* --- ANNOUNCE | 3 ++- CHANGES | 5 +++-- CMakeLists.txt | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index c3919be75..69f2c6ce5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -62,7 +62,8 @@ version 1.4.4beta07 [August 21, 2010] Updated prebuilt aclocal.m4 and ltmain.sh Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov) Update CMakelists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for - installing libpng in /usr/lib64 (FundaWang). + installing libpng in /usr/lib64 (Funda Wang). + Revise CMakeLists.txt to put the man pages in share/man/man* not man/man* Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 1cdc1269c..5a5b9bfca 100644 --- a/CHANGES +++ b/CHANGES @@ -2645,8 +2645,9 @@ version 1.4.4beta06 [August 11, 2010] version 1.4.4beta07 [August 21, 2010] Updated prebuilt aclocal.m4 and ltmain.sh Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov) - Update CMakelists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for - installing libpng in /usr/lib64 (FundaWang). + Update CMakeLists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for + installing libpng in /usr/lib64 (Funda Wang). + Revise CMakeLists.txt to put the man pages in share/man/man* not man/man* Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 627eae0f1..0a6c84434 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -256,8 +256,8 @@ if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL ) endif() if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) # Install man pages - install(FILES libpng.3 libpngpf.3 DESTINATION man/man3) - install(FILES png.5 DESTINATION man/man5) + install(FILES libpng.3 libpngpf.3 DESTINATION share/man/man3) + install(FILES png.5 DESTINATION share/man/man5) # Install pkg-config files install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)