]> granicus.if.org Git - python/commitdiff
Merge issue #15298: ensure _sysconfigdata is generated in build directory,
authorTrent Nelson <trent@trent.me>
Tue, 16 Oct 2012 12:17:11 +0000 (08:17 -0400)
committerTrent Nelson <trent@trent.me>
Tue, 16 Oct 2012 12:17:11 +0000 (08:17 -0400)
not source directory.

Patch by: Richard Oudkerk (sbt).

1  2 
Lib/sysconfig.py
Misc/NEWS
setup.py

Simple merge
diff --cc Misc/NEWS
index 7ca2d50f2dbf539b82f5e4216f5df8189de855d5,f779e02e00a2d884d087420c500ce74b5c471106..5d17aec0def37d248f063646d02837c7a42bc0bc
+++ b/Misc/NEWS
@@@ -165,10 -137,8 +168,10 @@@ Buil
  - Issue #15923: Fix a mistake in ``asdl_c.py`` that resulted in a TypeError
    after 2801bf875a24 (see #15801).
  
- - Issue #15819: Make sure we can build Python out-of-tree from a readonly source
-   directory.  (Somewhat related to Issue #9860.)
 +- Issue #16135: Remove OS/2 support.
 +
+ - Issue #15819: Make sure we can build Python out-of-tree from a read-only
+   source directory.  (Somewhat related to issue #9860.)
  
  Documentation
  -------------
diff --cc setup.py
Simple merge