Merge branch 'master' of ssh://pycam.git.sourceforge.net/gitroot/pycam/pycam

setup.py

@@ -35,8 +35,8 @@ import shutil
 
 from pycam import VERSION
 
-WINDOWS_START_SCRIPT = "scripts/pycam-loader.py"
-DEFAULT_START_SCRIPT = "scripts/pycam"
+WINDOWS_START_SCRIPT = os.path.join("scripts", "pycam-loader.py")
+DEFAULT_START_SCRIPT = os.path.join("scripts", "pycam")
 
 # we don't want to include the windows postinstall script in other installers
 is_windows_installer = "bdist_wininst" in sys.argv or "bdist_msi" in sys.argv
@@ -44,7 +44,8 @@ is_windows_installer = "bdist_wininst" in sys.argv or "bdist_msi" in sys.argv
 if is_windows_installer:
     shutil.copy2(os.path.join(BASE_DIR, DEFAULT_START_SCRIPT),
             os.path.join(BASE_DIR, WINDOWS_START_SCRIPT))
-    PLATFORM_SCRIPTS = [WINDOWS_START_SCRIPT, "scripts/pycam_win32_postinstall.py"]
+    PLATFORM_SCRIPTS = [WINDOWS_START_SCRIPT,
+            os.path.join("scripts", "pycam_win32_postinstall.py")]
 else:
     PLATFORM_SCRIPTS = [DEFAULT_START_SCRIPT]