浏览代码

Merge pull request #706 from richardkchapman/ee-rpms

Incorrect paths for generated files when included as a subproject
Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 13 年之前
父节点
当前提交
ea40408fdf

+ 23 - 23
install_directory/bash_startup.install

@@ -15,16 +15,16 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 ################################################################################
 
 
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bash/etc/init.d/install-init DESTINATION ${OSSDIR}/etc/init.d
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/etc/init.d/install-init DESTINATION ${OSSDIR}/etc/init.d
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bash/etc/init.d/uninstall-init DESTINATION ${OSSDIR}/etc/init.d
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/etc/init.d/uninstall-init DESTINATION ${OSSDIR}/etc/init.d
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/environment.conf DESTINATION ${OSSDIR}${CONFIG_DIR} 
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/environment.conf DESTINATION ${OSSDIR}${CONFIG_DIR} 
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) 
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) 
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bash/etc/init.d/hpcc-init DESTINATION ${OSSDIR}/etc/init.d
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/etc/init.d/hpcc-init DESTINATION ${OSSDIR}/etc/init.d
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/pid.sh DESTINATION ${OSSDIR}/etc/init.d/
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/pid.sh DESTINATION ${OSSDIR}/etc/init.d/
@@ -33,7 +33,7 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/pid.sh DES
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/lock.sh DESTINATION ${OSSDIR}/etc/init.d/
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/lock.sh DESTINATION ${OSSDIR}/etc/init.d/
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bash/etc/init.d/hpcc_common DESTINATION ${OSSDIR}/etc/init.d/
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/etc/init.d/hpcc_common DESTINATION ${OSSDIR}/etc/init.d/
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/init-functions DESTINATION ${OSSDIR}/etc/init.d/
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/init-functions DESTINATION ${OSSDIR}/etc/init.d/
@@ -42,13 +42,13 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/init-funct
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/export-path DESTINATION ${OSSDIR}/etc/init.d/
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bash/etc/init.d/export-path DESTINATION ${OSSDIR}/etc/init.d/
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bash/etc/init.d/dafilesrv DESTINATION ${OSSDIR}/etc/init.d
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/etc/init.d/dafilesrv DESTINATION ${OSSDIR}/etc/init.d
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/environment.conf DESTINATION ${CONFIG_DIR}/rpmnew
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/environment.conf DESTINATION ${CONFIG_DIR}/rpmnew
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/sbin/hpcc_setenv DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/hpcc_setenv DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/etc/sshkey/.ssh.md5 DESTINATION ${OSSDIR}/etc/sshkey
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/etc/sshkey/.ssh.md5 DESTINATION ${OSSDIR}/etc/sshkey
@@ -63,37 +63,37 @@ Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/etc/sshkey/.ssh/id_rsa DES
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/etc/sshkey/.ssh/id_rsa.pub DESTINATION ${OSSDIR}/etc/sshkey/.ssh
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/etc/sshkey/.ssh/id_rsa.pub DESTINATION ${OSSDIR}/etc/sshkey/.ssh
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/sbin/complete-uninstall.sh DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/complete-uninstall.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/sbin/keygen.sh DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/keygen.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/sbin/alter_confs.sh DESTINATION ${OSSDIR}/sbin
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/sbin/alter_confs.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/sbin/add_conf_settings.sh DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/add_conf_settings.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/sbin/rm_conf_settings.sh DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/rm_conf_settings.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/etc/DIR_NAME/genenvrules.conf DESTINATION ${CONFIG_DIR}/rpmnew
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/etc/DIR_NAME/genenvrules.conf DESTINATION ${CONFIG_DIR}/rpmnew
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-Install ( FILES ${CMAKE_BINARY_DIR}/version DESTINATION ${OSSDIR}${CONFIG_DIR}
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${OSSDIR}${CONFIG_DIR}
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
  
  
-Install ( FILES ${CMAKE_BINARY_DIR}/environment.xml DESTINATION ${OSSDIR}${CONFIG_DIR}/rpmnew
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/environment.xml DESTINATION ${OSSDIR}${CONFIG_DIR}/rpmnew
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bash/etc/init.d/configmgr DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/etc/init.d/configmgr DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bash/etc/init.d/regex.awk DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/etc/init.d/regex.awk DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bash/etc/init.d/get_ip_address.sh DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/etc/init.d/get_ip_address.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
 
 
@@ -102,7 +102,7 @@ install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bash/etc/init.d/get_ip_address.sh
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_configesp DESTINATION ${OSSDIR}/bin
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_configesp DESTINATION ${OSSDIR}/bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bin/init_dafilesrv DESTINATION ${OSSDIR}/bin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bin/init_dafilesrv DESTINATION ${OSSDIR}/bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_dali DESTINATION ${OSSDIR}/bin
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_dali DESTINATION ${OSSDIR}/bin
@@ -111,7 +111,7 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_dali DESTINATION
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_dfuserver DESTINATION ${OSSDIR}/bin
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_dfuserver DESTINATION ${OSSDIR}/bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/bin/init_eclagent DESTINATION ${OSSDIR}/bin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/bin/init_eclagent DESTINATION ${OSSDIR}/bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_eclserver DESTINATION ${OSSDIR}/bin
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_eclserver DESTINATION ${OSSDIR}/bin
@@ -141,14 +141,14 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_sasha DESTINATION
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_thor DESTINATION ${OSSDIR}/bin
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/bin/init_thor DESTINATION ${OSSDIR}/bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/sbin/hpcc-push.sh DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/hpcc-push.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/sbin/hpcc-run.sh DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/hpcc-run.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/sbin/install-cluster.sh DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/install-cluster.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-install ( FILES ${CMAKE_BINARY_DIR}/initfiles/sbin/remote-install-engine.sh DESTINATION ${OSSDIR}/sbin
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/remote-install-engine.sh DESTINATION ${OSSDIR}/sbin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

+ 9 - 9
install_directory/configmgr.install

@@ -15,9 +15,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 ################################################################################
 
 
-Install ( FILES ${CMAKE_BINARY_DIR}/configmgr.conf DESTINATION ${OSSDIR}${CONFIG_DIR}/configmgr
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/configmgr.conf DESTINATION ${OSSDIR}${CONFIG_DIR}/configmgr
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
-Install ( FILES ${CMAKE_BINARY_DIR}/esp.xml DESTINATION ${OSSDIR}${CONFIG_DIR}/configmgr
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/esp.xml DESTINATION ${OSSDIR}${CONFIG_DIR}/configmgr
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
 #Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/etc/init.d/configmgr DESTINATION ${OSSDIR}/etc/init.d
 #Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/etc/init.d/configmgr DESTINATION ${OSSDIR}/etc/init.d
@@ -40,10 +40,10 @@ Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/D
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/directories.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/directories.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/componentfiles/configxml/dropzone.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/componentfiles/configxml/dropzone.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 #Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/ecl/eclagent/eclagent_config.xsd DESTINATION ${OSSDIR}/componentfiles/configxml ##Changed on Sridhar's request
 #Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/ecl/eclagent/eclagent_config.xsd DESTINATION ${OSSDIR}/componentfiles/configxml ##Changed on Sridhar's request
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/componentfiles/configxml/eclagent_config.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/componentfiles/configxml/eclagent_config.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/eclplus.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/eclplus.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
@@ -63,11 +63,11 @@ Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/e
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/esp_service_wsecl.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/esp_service_wsecl.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/componentfiles/configxml/espsmcservice.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/componentfiles/configxml/espsmcservice.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/esp.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/esp.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/componentfiles/configxml/ftslave_linux.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/componentfiles/configxml/ftslave_linux.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/ftslave.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/ftslave.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
@@ -85,7 +85,7 @@ Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/p
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/regress.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/regress.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/componentfiles/configxml/roxie.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/componentfiles/configxml/roxie.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/sasha.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/sasha.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
@@ -93,7 +93,7 @@ Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/S
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/soapplus.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/soapplus.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/componentfiles/configxml/thor.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/componentfiles/configxml/thor.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/topology.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/configxml/topology.xsd DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
@@ -124,7 +124,7 @@ Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/esp/files/img/expand.gif DESTINATION
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/esp/files/img/save.gif DESTINATION ${OSSDIR}/componentfiles/files/img
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/esp/files/img/save.gif DESTINATION ${OSSDIR}/componentfiles/files/img
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
 
-Install ( FILES ${CMAKE_BINARY_DIR}/buildset.xml DESTINATION ${OSSDIR}/componentfiles/configxml
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/buildset.xml DESTINATION ${OSSDIR}/componentfiles/configxml
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     
     
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/esp/files/img/cloud.jpg DESTINATION ${OSSDIR}/componentfiles/files/img
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/esp/files/img/cloud.jpg DESTINATION ${OSSDIR}/componentfiles/files/img

+ 1 - 1
install_directory/ftslave.install

@@ -18,5 +18,5 @@
 # ftslave Supplementals
 # ftslave Supplementals
 # SCHEMA: name=ftslave_linux.xsd method=schema
 # SCHEMA: name=ftslave_linux.xsd method=schema
 ### name=run_thor
 ### name=run_thor
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/componentfiles/ftslave/run_ftslave DESTINATION ${OSSDIR}/bin
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/componentfiles/ftslave/run_ftslave DESTINATION ${OSSDIR}/bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

+ 1 - 1
install_directory/thor.install

@@ -48,7 +48,7 @@ Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/thor/setup_
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/thor/sshslaves DESTINATION ${OSSDIR}/bin
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/thor/sshslaves DESTINATION ${OSSDIR}/bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 ### name=start_backupnode
 ### name=start_backupnode
-Install ( FILES ${CMAKE_BINARY_DIR}/initfiles/componentfiles/thor/start_backupnode DESTINATION ${OSSDIR}/bin
+Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/initfiles/componentfiles/thor/start_backupnode DESTINATION ${OSSDIR}/bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 ### name=start_slave
 ### name=start_slave
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/thor/start_slave DESTINATION ${OSSDIR}/bin
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/initfiles/componentfiles/thor/start_slave DESTINATION ${OSSDIR}/bin