Revision: 40480
http://brlcad.svn.sourceforge.net/brlcad/?rev=40480&view=rev
Author: starseeker
Date: 2010-09-06 02:36:17 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
I had wanted to leave the src/other build logic untouched, but unfortunately
the external CMakeLists.txt files have their own ideas about man page locations
and iwidgets was ignoring the --mandir option. Maybe zlib and png will apply a
patch to make this behavior default? Worth trying. Iwidgets is probably just
going to have to stay a local patch.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/incrTcl/iwidgets/Makefile.in
brlcad/branches/cmake/src/other/libpng/CMakeLists.txt
brlcad/branches/cmake/src/other/libz/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/incrTcl/iwidgets/Makefile.in
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/iwidgets/Makefile.in
2010-09-05 22:16:58 UTC (rev 40479)
+++ brlcad/branches/cmake/src/other/incrTcl/iwidgets/Makefile.in
2010-09-06 02:36:17 UTC (rev 40480)
@@ -48,7 +48,7 @@
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
# Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
+MAN_INSTALL_DIR = @mandir@/mann
# Directory containing Tcl source code (for library used during test):
TCL_SRC_DIR = @TCL_SRC_DIR@
Modified: brlcad/branches/cmake/src/other/libpng/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libpng/CMakeLists.txt 2010-09-05
22:16:58 UTC (rev 40479)
+++ brlcad/branches/cmake/src/other/libpng/CMakeLists.txt 2010-09-06
02:36:17 UTC (rev 40480)
@@ -251,10 +251,15 @@
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
DESTINATION bin)
endif()
+
+IF(NOT MAN_DIR)
+ SET(MAN_DIR "man")
+ENDIF(NOT MAN_DIR)
+
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 ${MAN_DIR}/man3)
+ install(FILES png.5 DESTINATION ${MAN_DIR}/man5)
# Install pkg-config files
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc
DESTINATION lib/pkgconfig)
Modified: brlcad/branches/cmake/src/other/libz/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libz/CMakeLists.txt 2010-09-05 22:16:58 UTC
(rev 40479)
+++ brlcad/branches/cmake/src/other/libz/CMakeLists.txt 2010-09-06 02:36:17 UTC
(rev 40480)
@@ -163,8 +163,12 @@
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)
endif()
+
+IF(NOT MAN_DIR)
+ SET(MAN_DIR "share/man")
+ENDIF(NOT MAN_DIR)
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
- install(FILES zlib.3 DESTINATION share/man/man3)
+ install(FILES zlib.3 DESTINATION ${MAN_DIR}/man3)
endif()
#============================================================================
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
