diff -up uranium-lulzbot-3.2.17/CMakeLists.txt.system uranium-lulzbot-3.2.17/CMakeLists.txt --- uranium-lulzbot-3.2.17/CMakeLists.txt.system 2018-02-27 22:14:25.000000000 -0500 +++ uranium-lulzbot-3.2.17/CMakeLists.txt 2018-04-16 15:11:15.976808134 -0400 @@ -1,4 +1,4 @@ -project(uranium NONE) +project(uranium-lulzbot NONE) cmake_minimum_required(VERSION 2.8.12) @@ -61,15 +61,15 @@ if(NOT PYTHON_SITE_PACKAGES_DIR) set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE STRING "Directory to install Python bindings to") endif() set(URANIUM_INSTALL_MODULES_PATH ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ ) - set(URANIUM_INSTALL_PLUGINS_PATH lib/uranium) + set(URANIUM_INSTALL_PLUGINS_PATH lib/uranium-lulzbot) else() set(URANIUM_INSTALL_MODULES_PATH ${CMAKE_INSTALL_DATADIR}/cmake/Modules/) - set(URANIUM_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/uranium ) + set(URANIUM_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/uranium-lulzbot ) endif() -install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR}) +install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot) install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake DESTINATION ${URANIUM_INSTALL_MODULES_PATH}) -install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium) +install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium-lulzbot) install(DIRECTORY plugins DESTINATION ${URANIUM_INSTALL_PLUGINS_PATH} ) include(CPackConfig.cmake) diff -up uranium-lulzbot-3.2.17/UM/Application.py.system uranium-lulzbot-3.2.17/UM/Application.py --- uranium-lulzbot-3.2.17/UM/Application.py.system 2018-02-27 22:14:25.000000000 -0500 +++ uranium-lulzbot-3.2.17/UM/Application.py 2018-04-16 15:10:10.473277870 -0400 @@ -64,7 +64,7 @@ class Application: Resources.ApplicationVersion = version Resources.addSearchPath(os.path.join(os.path.dirname(sys.executable), "resources")) - Resources.addSearchPath(os.path.join(Application.getInstallPrefix(), "share", "uranium", "resources")) + Resources.addSearchPath(os.path.join(Application.getInstallPrefix(), "share", "uranium-lulzbot", "resources")) Resources.addSearchPath(os.path.join(Application.getInstallPrefix(), "Resources", "uranium", "resources")) Resources.addSearchPath(os.path.join(Application.getInstallPrefix(), "Resources", self.getApplicationName(), "resources")) if hasattr(sys, "frozen"): @@ -113,7 +113,7 @@ class Application: self._plugin_registry = PluginRegistry.getInstance() - self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "lib", "uranium")) + self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "lib", "uranium-lulzbot")) self._plugin_registry.addPluginLocation(os.path.join(os.path.dirname(sys.executable), "plugins")) self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "Resources", "uranium", "plugins")) self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "Resources", self.getApplicationName(), "plugins"))