# HG changeset patch
# User Gary Furnish <gfurnish@gfurnish.net>
# Date 1211865227 21600
# Node ID e15312b67334703f19b42c1a5ad21750bd4b241f
# Parent  eb774ef63bd9624394205be5401d921e08d1699b
Fix Trac_3311

diff -r eb774ef63bd9 -r e15312b67334 sagebuild/sagebuild.py
--- a/sagebuild/sagebuild.py	Sat May 24 16:04:51 2008 -0700
+++ b/sagebuild/sagebuild.py	Mon May 26 23:13:47 2008 -0600
@@ -465,7 +465,7 @@ def buildsage(env, gccc):
     for filenm in cacheinfo[0]:
         if os.path.splitext(filenm)[1]==".py":
             filepart = (os.path.split(filenm)[0])
-            newdir = env.options['SAGE_ROOT'] + '/devel/sage/build/sage/' + filepart.replace('devel/sage/sage','')
+            newdir = tempdir + '/devel/sage/build/sage/' + filepart.replace('devel/sage/sage','')
             filename = os.path.split(filenm)[1]
             if filename[0]=='.':
                 continue
@@ -474,11 +474,12 @@ def buildsage(env, gccc):
             if verbose>30:
                 print cmd
             os.system( cmd )
-    #Setup the site-packages symlink if it doesn't already exist
-    safesymlink('../../../../devel/sage/build/sage','local/lib/python/site-packages/sage')
+    #Setup DSage
+    os.system('cp %s %s' % (tempdir+'/devel/sage/sage/dsage/scripts/dsage_worker.py',tempdir+'/local/bin'))
+    os.system('cp %s %s' % (tempdir+'/devel/sage/sage/dsage/scripts/dsage_setup.py',tempdir+'/local/bin'))
     #Handle DSage
     safemkdirs('local/dsage')
-    safesymlink('../../devel/sage/sage/dsage/web', 'local/dsage/web')
+    os.system('cp -r %s %s' % (tempdir+'/devel/sage/sage/dsage/web',tempdir+'/local/dsage/'))
 
 def sagebuild_exit():
     """
# HG changeset patch
# User Gary Furnish <gfurnish@gfurnish.net>
# Date 1211865507 21600
# Node ID f438209624994ca6fc6a89a65209e665dda34f2d
# Parent  e15312b67334703f19b42c1a5ad21750bd4b241f
fix a bug in last 3311 commit

diff -r e15312b67334 -r f43820962499 sagebuild/sagebuild.py
--- a/sagebuild/sagebuild.py	Mon May 26 23:13:47 2008 -0600
+++ b/sagebuild/sagebuild.py	Mon May 26 23:18:27 2008 -0600
@@ -474,6 +474,8 @@ def buildsage(env, gccc):
             if verbose>30:
                 print cmd
             os.system( cmd )
+    #Setup the site-packages symlink if it doesn't already exist 
+    safesymlink('../../../../devel/sage/build/sage','local/lib/python/site-packages/sage') 
     #Setup DSage
     os.system('cp %s %s' % (tempdir+'/devel/sage/sage/dsage/scripts/dsage_worker.py',tempdir+'/local/bin'))
     os.system('cp %s %s' % (tempdir+'/devel/sage/sage/dsage/scripts/dsage_setup.py',tempdir+'/local/bin'))