Revision: 42131
http://brlcad.svn.sourceforge.net/brlcad/?rev=42131&view=rev
Author: starseeker
Date: 2011-01-12 04:33:35 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
the Tcl/Tk man page script was installing to CMAKE_INSTALL_DIR even during make
package - make it respect DESTDIR if it's set.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tcl/doc/install_man.cmake.in
brlcad/branches/cmake/src/other/tk/doc/install_man.cmake.in
Modified: brlcad/branches/cmake/src/other/tcl/doc/install_man.cmake.in
===================================================================
--- brlcad/branches/cmake/src/other/tcl/doc/install_man.cmake.in
2011-01-12 04:32:33 UTC (rev 42130)
+++ brlcad/branches/cmake/src/other/tcl/doc/install_man.cmake.in
2011-01-12 04:33:35 UTC (rev 42131)
@@ -3,15 +3,20 @@
SET(TCL_DOC_DIR @TCL_DOC_DIR@)
-FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/man1)
-FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/man3)
-FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/mann)
+SET(TCL_DEST_DIR "$ENV{DESTDIR}")
+IF(NOT TCL_DEST_DIR)
+ SET(TCL_DEST_DIR ${CMAKE_INSTALL_PREFIX})
+ENDIF(NOT TCL_DEST_DIR)
+FILE(MAKE_DIRECTORY ${TCL_DEST_DIR}/@MAN_DIR@/man1)
+FILE(MAKE_DIRECTORY ${TCL_DEST_DIR}/@MAN_DIR@/man3)
+FILE(MAKE_DIRECTORY ${TCL_DEST_DIR}/@MAN_DIR@/mann)
+
SET(tcl_MAN1
tclsh.1
)
FOREACH(manfile ${tcl_MAN1})
- EXEC_PROGRAM(${SH_EXEC} ARGS ${TCL_DOC_DIR}/../unix/installManPage
${TCL_DOC_DIR}/${manfile} ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/man1)
+ EXEC_PROGRAM(${SH_EXEC} ARGS ${TCL_DOC_DIR}/../unix/installManPage
${TCL_DOC_DIR}/${manfile} ${TCL_DEST_DIR}/@MAN_DIR@/man1)
ENDFOREACH(manfile ${tcl_MAN1})
SET(tcl_MAN3
@@ -117,7 +122,7 @@
WrongNumArgs.3
)
FOREACH(manfile ${tcl_MAN3})
- EXEC_PROGRAM(${SH_EXEC} ARGS ${TCL_DOC_DIR}/../unix/installManPage
${TCL_DOC_DIR}/${manfile} ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/man3)
+ EXEC_PROGRAM(${SH_EXEC} ARGS ${TCL_DOC_DIR}/../unix/installManPage
${TCL_DOC_DIR}/${manfile} ${TCL_DEST_DIR}/@MAN_DIR@/man3)
ENDFOREACH(manfile ${tcl_MAN3})
SET(tcl_MANN
@@ -231,6 +236,6 @@
while.n
)
FOREACH(manfile ${tcl_MANN})
- EXEC_PROGRAM(${SH_EXEC} ARGS ${TCL_DOC_DIR}/../unix/installManPage
${TCL_DOC_DIR}/${manfile} ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/mann)
+ EXEC_PROGRAM(${SH_EXEC} ARGS ${TCL_DOC_DIR}/../unix/installManPage
${TCL_DOC_DIR}/${manfile} ${TCL_DEST_DIR}/@MAN_DIR@/mann)
ENDFOREACH(manfile ${tcl_MANN})
Modified: brlcad/branches/cmake/src/other/tk/doc/install_man.cmake.in
===================================================================
--- brlcad/branches/cmake/src/other/tk/doc/install_man.cmake.in 2011-01-12
04:32:33 UTC (rev 42130)
+++ brlcad/branches/cmake/src/other/tk/doc/install_man.cmake.in 2011-01-12
04:33:35 UTC (rev 42131)
@@ -3,15 +3,20 @@
SET(TK_DOC_DIR @TK_DOC_DIR@)
-FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/man1)
-FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/man3)
-FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/mann)
+SET(TK_DEST_DIR "$ENV{DESTDIR}")
+IF(NOT TK_DEST_DIR)
+ SET(TK_DEST_DIR ${CMAKE_INSTALL_PREFIX})
+ENDIF(NOT TK_DEST_DIR)
+FILE(MAKE_DIRECTORY ${TK_DEST_DIR}/@MAN_DIR@/man1)
+FILE(MAKE_DIRECTORY ${TK_DEST_DIR}/@MAN_DIR@/man3)
+FILE(MAKE_DIRECTORY ${TK_DEST_DIR}/@MAN_DIR@/mann)
+
SET(tk_MAN1
wish.1
)
FOREACH(manfile ${tk_MAN1})
- EXEC_PROGRAM(${SH_EXEC} ARGS ${TK_DOC_DIR}/../unix/installManPage
${TK_DOC_DIR}/${manfile} ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/man1)
+ EXEC_PROGRAM(${SH_EXEC} ARGS ${TK_DOC_DIR}/../unix/installManPage
${TK_DOC_DIR}/${manfile} ${TK_DEST_DIR}/@MAN_DIR@/man1)
ENDFOREACH(manfile ${tk_MAN1})
SET(tk_MAN3
@@ -104,7 +109,7 @@
ttk_Theme.3
)
FOREACH(manfile ${tk_MAN3})
- EXEC_PROGRAM(${SH_EXEC} ARGS ${TK_DOC_DIR}/../unix/installManPage
${TK_DOC_DIR}/${manfile} ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/man3)
+ EXEC_PROGRAM(${SH_EXEC} ARGS ${TK_DOC_DIR}/../unix/installManPage
${TK_DOC_DIR}/${manfile} ${TK_DEST_DIR}/@MAN_DIR@/man3)
ENDFOREACH(manfile ${tk_MAN3})
SET(tk_MANN
@@ -193,6 +198,6 @@
wm.n
)
FOREACH(manfile ${tk_MANN})
- EXEC_PROGRAM(${SH_EXEC} ARGS ${TK_DOC_DIR}/../unix/installManPage
${TK_DOC_DIR}/${manfile} ${CMAKE_INSTALL_PREFIX}/@MAN_DIR@/mann)
+ EXEC_PROGRAM(${SH_EXEC} ARGS ${TK_DOC_DIR}/../unix/installManPage
${TK_DOC_DIR}/${manfile} ${TK_DEST_DIR}/@MAN_DIR@/mann)
ENDFOREACH(manfile ${tk_MANN})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
