diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-08 20:13:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-08 20:13:39 (GMT) |
| commit | 9cdd9896670b54f23ca697eb2f81bc740f880f40 (patch) | |
| tree | 6c90d6c2797d646c292205a029dd369ebdfca9d1 | |
| parent | 142facc6dd73c3abcf808d598272ccd4bf235463 (diff) | |
| parent | b0cb29bb06918d3d6a60d22c0e54b8ca6e6b4f36 (diff) | |
| download | CMake-9cdd9896670b54f23ca697eb2f81bc740f880f40.zip CMake-9cdd9896670b54f23ca697eb2f81bc740f880f40.tar.gz CMake-9cdd9896670b54f23ca697eb2f81bc740f880f40.tar.bz2 | |
Merge topic 'fixCPackDocTypo'
b0cb29b Fix some typos in CPACK_SET_DESTDIR doc
| -rw-r--r-- | Source/CPack/cmCPackDocumentVariables.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackDocumentVariables.cxx b/Source/CPack/cmCPackDocumentVariables.cxx index 23e99f8..d2e3802 100644 --- a/Source/CPack/cmCPackDocumentVariables.cxx +++ b/Source/CPack/cmCPackDocumentVariables.cxx @@ -44,14 +44,14 @@ void cmCPackDocumentVariables::DefineVariables(cmake* cm) "Boolean toggle to make CPack use DESTDIR mechanism when" " packaging.", "DESTDIR means DESTination DIRectory." " It is commonly used by makefile " - "users in order to install software at non-default location. It a" - "basic relocation mechanism. " + "users in order to install software at non-default location. It " + "is a basic relocation mechanism. " "It is usually invoked like this:\n" " make DESTDIR=/home/john install\n" "which will install the concerned software using the" " installation prefix, e.g. \"/usr/local\" prepended with " "the DESTDIR value which finally gives \"/home/john/usr/local\"." - " When preparing a package CPack first installs the items to be " + " When preparing a package, CPack first installs the items to be " "packaged in a local (to the build tree) directory by using the " "same DESTDIR mechanism. Nevertheless, if " "CPACK_SET_DESTDIR is set then CPack will set DESTDIR before" @@ -63,7 +63,7 @@ void cmCPackDocumentVariables::DefineVariables(cmake* cm) "Manually setting CPACK_SET_DESTDIR may help (or simply be" " necessary) if some install rules uses absolute " "DESTINATION (see CMake INSTALL command)." - "However, starting with" + " However, starting with" " CPack/CMake 2.8.3 RPM and DEB installers tries to handle DESTDIR" " automatically so that it is seldom necessary for the user to set" " it.", false, |