Refs #4754. Ensure CMAKE_SET_DESTDIR doesn't interfere with prefix

mantidproject · Feb 7, 2012 · a8dea67 · a8dea67
1 parent a16cbcc
commit a8dea67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Code/Mantid/Build/CMake/CPackLinuxSetup.cmake b/Code/Mantid/Build/CMake/CPackLinuxSetup.cmake
@@ -63,9 +63,13 @@ if ( ${UNIX_DIST} MATCHES "RedHatEnterprise" OR ${UNIX_DIST} MATCHES "Fedora")
       set ( CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}.fc16" )
     endif ( ${UNIX_CODENAME} MATCHES "Tikanga" )
 
+    # If CMAKE_SET_DESTDIR is ON then the Prefix doesn't get put in the spec file
+    if ( CMAKE_SET_DESTDIR )
+      set( CPACK_RPM_SPEC_MORE_DEFINE "Prefix: ${CPACK_PACKAGING_INSTALL_PREFIX}" )
+    endif()
+
     # according to rpm.org: name-version-release.architecture.rpm
     set ( CPACK_PACKAGE_FILE_NAME
       "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}" )
-    set( CPACK_RPM_SPEC_MORE_DEFINE "Prefix: ${CPACK_PACKAGING_INSTALL_PREFIX}" ) 
   endif ( RPMBUILD_CMD)
 endif ( ${UNIX_DIST} MATCHES "RedHatEnterprise" OR ${UNIX_DIST} MATCHES "Fedora")
diff --git a/Code/Mantid/Build/CMake/LinuxSetup.cmake b/Code/Mantid/Build/CMake/LinuxSetup.cmake
@@ -98,7 +98,7 @@ file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/rpm_remove_links.sh "#!/bin/sh\n"
 )
 
 file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/rpm_remove_empty_install.sh "#!/bin/sh\n"
-                                                             "if [ ! -z \"${RPM_INSTALL_PREFIX0}\" ]; then\n"
+                                                             "if [ ! -z \"$RPM_INSTALL_PREFIX0\" ]; then\n"
                                                              "  find $RPM_INSTALL_PREFIX0 -mindepth 1 -type d -empty -delete\n"
                                                              "  rmdir --ignore-fail-on-non-empty -p $RPM_INSTALL_PREFIX0\n"
                                                              "fi\n"