From e0301c22953d26be29d3cb89a26fb6a4599b854e Mon Sep 17 00:00:00 2001 From: stevenknight Date: Tue, 30 Mar 2010 13:32:51 +0000 Subject: [PATCH] Remove the recently-removed _scons_sets15.py from MANIFEST.in. Fix a typo in the SConstruct. git-svn-id: http://scons.tigris.org/svn/scons/trunk@4737 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- SConstruct | 2 +- src/engine/MANIFEST.in | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 08c7683b..605f43f1 100644 --- a/SConstruct +++ b/SConstruct @@ -767,7 +767,7 @@ for p in [ scons ]: MANIFEST_in_list.append(MANIFEST_in) files = [x[:-1] for x in open(MANIFEST_in).readlines()] raw_files.extend(files) - src_files.extend([os.path.join(subdir, x) for x in files]) + src_files.extend([os.path.join(ssubdir, x) for x in files]) for f in files: r = os.path.join(sp['rpm_dir'], f) rpm_files.append(r) diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index 2185d301..e1801707 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -6,7 +6,6 @@ SCons/compat/_scons_hashlib.py SCons/compat/_scons_itertools.py SCons/compat/_scons_optparse.py SCons/compat/_scons_sets.py -SCons/compat/_scons_sets15.py SCons/compat/_scons_shlex.py SCons/compat/_scons_subprocess.py SCons/compat/_scons_textwrap.py -- 2.26.2