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

diff --git a/SConstruct b/SConstruct
index 08c7683b644b640da639a957281f57f2cc18866d..605f43f116f4a0d6b861d2785bf47509d3f3b0f3 100644 (file)
--- 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 2185d3015236478958b64b774bca12810254ce9f..e18017077cffb4942d72124e27cd3be2a5f1756a 100644 (file)
--- 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