from SConstruct export just env and PREFIX

SConscript

@@ -1,4 +1,4 @@
-Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+Import(Split("env PREFIX"))
 
 # *************** Targets ****************
 
@@ -11,9 +11,3 @@ env.Alias("build", Split('server/fspd clients/ contrib/ tests/') )
 #Change default target to build
 env.Default(None)
 env.Default("build")
-
-#Add dist target
-env.Replace(TARFLAGS = '-c -z')
-env.Alias("dist",TARBALL)
-#Clean tarball when doing build clean
-env.Clean("build",TARBALL)

SConstruct

@@ -7,7 +7,6 @@ EnsurePythonVersion(2,2)
 
 # set defaults
 PREFIX='/usr/local'
-PACKAGE='fsp'
 VERSION='2.8.1b25'
 EFENCE=False
 
@@ -100,9 +99,7 @@ if EFENCE == True:
     EFENCE=conf.CheckLib("efence","EF_Abort")
 conf.Finish()
 
-#configure globals
-TARBALL=PACKAGE+'-'+VERSION+'.tar.gz'
 env.Append(CPPFLAGS = "-DPACKAGE_VERSION=\\\""+VERSION+"\\\"")
 # process build rules
-Export( Split("env PREFIX PACKAGE VERSION TARBALL"))
+Export( Split("env PREFIX"))
 env.SConscript(dirs=Split('. bsd_src common server client clients contrib tests'))

bsd_src/SConscript

@@ -1,4 +1,4 @@
-Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+Import(Split("env"))
 
 bsdfsp=env.StaticLibrary(target = 'bsdfsp', source = Split('''
 cmp.c fnmatch.c glob.c operator.c print.c

client/SConscript

@@ -1,4 +1,4 @@
-Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+Import(Split("env PREFIX"))
 
 client=env.StaticLibrary(target = 'client', source = Split('''
 lib.c  lock.c util.c

clients/SConscript

@@ -1,4 +1,4 @@
-Import(Split("env PREFIX VERSION PACKAGE TARBALL common bsdfsp client"))
+Import(Split("env PREFIX common bsdfsp client"))
 
 env.Program(target = 'fcatcmd',source=['fcatcmd.c']+client+common)
 env.Program(target = 'fcdcmd', source=['fcdcmd.c','printpro.c']+client+common)

common/SConscript

@@ -1,4 +1,4 @@
-Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+Import(Split("env PREFIX"))
 
 common=env.StaticLibrary(target = 'common', source = Split('''
 random.c udp_io.c getsl.c

contrib/SConscript

@@ -1,3 +1,3 @@
-Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+Import(Split("env PREFIX"))
 
 env.Program(target = 'fspscan', source = 'fspscan.c')

server/SConscript

@@ -1,4 +1,4 @@
-Import(Split("env PREFIX VERSION PACKAGE TARBALL common bsdfsp"))
+Import(Split("env PREFIX common bsdfsp"))
 
 fspd=env.Program(target = 'fspd', source = Split('''
 acl.c       file.c      info.c      main.c      random.c

tests/SConscript

@@ -1,4 +1,4 @@
-Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+Import(Split("env PREFIX"))
 
 env.Program(target = 'cachecheck', source = ['cachecheck.c','../server/fifocache.c'])
 env.Program(target = 'mklargefile', source = 'mklargefile.c')