diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-14 19:39:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-14 19:39:00 (GMT) |
| commit | 2c7d36ce6fd0cef9cbd45bb94795dc42526424f2 (patch) | |
| tree | 6e2004ade3e908d133c449c09e3337c8635fb615 | |
| parent | 03c4623fb4605a347acc20a1914582e794dd474d (diff) | |
| parent | 8d366cd1ebc2a5937a40c4b44074852e3f7e7fae (diff) | |
| download | CMake-2c7d36ce6fd0cef9cbd45bb94795dc42526424f2.zip CMake-2c7d36ce6fd0cef9cbd45bb94795dc42526424f2.tar.gz CMake-2c7d36ce6fd0cef9cbd45bb94795dc42526424f2.tar.bz2 | |
Merge topic 'CPackRPM-Fix0011595'
8d366cd CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...)
| -rw-r--r-- | Modules/CPackRPM.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index ab909f4..026c45a 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -566,10 +566,9 @@ mv $RPM_BUILD_ROOT \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\" %install if [ -e $RPM_BUILD_ROOT ]; then - mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot/*\" $RPM_BUILD_ROOT -else - mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\" $RPM_BUILD_ROOT + rm -rf $RPM_BUILD_ROOT fi +mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\" $RPM_BUILD_ROOT %clean |