X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=df81facb8435e987987320d907b2ff80d234710f;hb=f2f5d59e83863f3b513950173baee1b6da2aee3c;hp=9a01aeebfdfc1477c84b6a75b2ff492cffb0b436;hpb=5093ab07f55b7f5830c7fad1305c7e533493f949;p=senf.git diff --git a/SConstruct b/SConstruct index 9a01aee..df81fac 100644 --- a/SConstruct +++ b/SConstruct @@ -102,7 +102,8 @@ if not logname: logname = pwd.getpwuid(os.getuid()).pw_name def dpkgIgnoredFilesOpts(target, source, env, for_signature): - return [ '-I%s' % os.path.split(f)[1] for f in env.subst('$DPKG_IGNORED_FILES').split() ] + return [ '-I%s' % (('/' in f) and (os.path.split(os.getcwd())[1])+f or f) + for f in env.subst('$DPKG_IGNORED_FILES').split() ] # Options used to debug inlining: # @@ -129,10 +130,10 @@ env.Append( 'CONCURRENCY_LEVEL' : env.GetOption('num_jobs') or "1", 'SCONS' : 1, 'PATH' : os.environ.get('PATH'), - 'TEXINPUTS' : os.environ.get('TEXINPUTS'), + 'TEXINPUTS' : os.environ.get('TEXINPUTS',env.Dir('#/doclib').abspath + ':'), }, - LOCAL_CONFIG_FILES = [ 'Doxyfile.local', 'SConfig', 'local_config.hh' ], - DPKG_IGNORED_FILES = [ '$LOCAL_CONFIG_FILES', '.svn', '_templates' ], + LOCAL_CONFIG_FILES = [ '/Doxyfile.local', '/SConfig', '/local_config.hh' ], + DPKG_IGNORED_FILES = [ '$LOCAL_CONFIG_FILES', '.svn', '/_templates' ], DPKG_IGNORED_FILES_OPTS = dpkgIgnoredFilesOpts, CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign', '.sconsign.dblite' ], BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot $DPKG_IGNORED_FILES_OPTS", @@ -183,11 +184,6 @@ if not env.GetOption('clean') and not os.path.exists(".prepare-stamp") \ env.Clean('all', '.prepare-stamp') -# Not nice, but until we get to fixing the dependency jungle -# concerning generated sources ... -scripts = [] -dependencies = [] - SConscript(glob.glob("*/SConscript")) SENFSCons.StandardTargets(env)