Blob Blame Raw
diff -up uranium-lulzbot-2.6.22/CMakeLists.txt.system uranium-lulzbot-2.6.22/CMakeLists.txt
--- uranium-lulzbot-2.6.22/CMakeLists.txt.system	2017-08-02 05:46:28.000000000 -0400
+++ uranium-lulzbot-2.6.22/CMakeLists.txt	2017-08-16 15:08:37.749062107 -0400
@@ -1,4 +1,4 @@
-project(uranium NONE)
+project(uranium-lulzbot NONE)
 
 cmake_minimum_required(VERSION 2.8.12)
 
@@ -64,15 +64,15 @@ if(NOT PYTHON_SITE_PACKAGES_DIR)
 	set(URANIUM_INSTALL_MODULES_PATH 
 		${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ )
 	set(URANIUM_INSTALL_PLUGINS_PATH 
-		lib/uranium)
+		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-2.6.22/UM/Application.py.system uranium-lulzbot-2.6.22/UM/Application.py
--- uranium-lulzbot-2.6.22/UM/Application.py.system	2017-08-02 05:46:28.000000000 -0400
+++ uranium-lulzbot-2.6.22/UM/Application.py	2017-08-16 15:08:13.878701303 -0400
@@ -61,7 +61,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"):
@@ -108,7 +108,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"))