Rename 'headers' to 'include' to match sysconfig.

1 files changed, 17 insertions, 13 deletions

diff --git a/distutils/command/install.py b/distutils/command/install.py
index b1876748..1267a51e 100644
--- a/distutils/command/install.py
+++ b/distutils/command/install.py
@@ -23,7 +23,7 @@ HAS_USER_SITE = True
 WINDOWS_SCHEME = {
     'purelib': '$base/Lib/site-packages',
     'platlib': '$base/Lib/site-packages',
-    'headers': '$base/Include/$dist_name',
+    'include': '$base/Include/$dist_name',
     'scripts': '$base/Scripts',
     'data'   : '$base',
 }
@@ -32,14 +32,14 @@ INSTALL_SCHEMES = {
     'unix_prefix': {
         'purelib': '$base/lib/python$py_version_short/site-packages',
         'platlib': '$platbase/$platlibdir/python$py_version_short/site-packages',
-        'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
+        'include': '$base/include/python$py_version_short$abiflags/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
         },
     'unix_home': {
         'purelib': '$base/lib/python',
         'platlib': '$base/$platlibdir/python',
-        'headers': '$base/include/python/$dist_name',
+        'include': '$base/include/python/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
         },
@@ -47,14 +47,14 @@ INSTALL_SCHEMES = {
     'pypy': {
         'purelib': '$base/site-packages',
         'platlib': '$base/site-packages',
-        'headers': '$base/include/$dist_name',
+        'include': '$base/include/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
         },
     'pypy_nt': {
         'purelib': '$base/site-packages',
         'platlib': '$base/site-packages',
-        'headers': '$base/include/$dist_name',
+        'include': '$base/include/$dist_name',
         'scripts': '$base/Scripts',
         'data'   : '$base',
         },
@@ -65,7 +65,7 @@ if HAS_USER_SITE:
     INSTALL_SCHEMES['nt_user'] = {
         'purelib': '$usersite',
         'platlib': '$usersite',
-        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
+        'include': '$userbase/Python$py_version_nodot/Include/$dist_name',
         'scripts': '$userbase/Python$py_version_nodot/Scripts',
         'data'   : '$userbase',
         }
@@ -73,7 +73,7 @@ if HAS_USER_SITE:
     INSTALL_SCHEMES['unix_user'] = {
         'purelib': '$usersite',
         'platlib': '$usersite',
-        'headers':
+        'include':
             '$userbase/include/python$py_version_short$abiflags/$dist_name',
         'scripts': '$userbase/bin',
         'data'   : '$userbase',
@@ -82,7 +82,7 @@ if HAS_USER_SITE:
 # The keys to an installation scheme; if any new types of files are to be
 # installed, be sure to add an entry to every installation scheme above,
 # and to SCHEME_KEYS here.
-SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
+SCHEME_KEYS = ('purelib', 'platlib', 'include', 'scripts', 'data')
 
 
 def _load_schemes():
@@ -198,7 +198,7 @@ class install(Command):
         # that installation scheme.
         self.install_purelib = None     # for pure module distributions
         self.install_platlib = None     # non-pure (dists w/ extensions)
-        self.install_headers = None     # for C/C++ headers
+        self.install_include = None     # for C/C++ headers
         self.install_lib = None         # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
@@ -247,6 +247,10 @@ class install(Command):
 
         self.record = None
 
+    @property
+    def install_headers(self):
+        # for compatibility
+        return self.install_include
 
     # -- Option finalizing methods -------------------------------------
     # (This is rather more involved than for most commands,
@@ -376,7 +380,7 @@ class install(Command):
         # Convert directories from Unix /-separated syntax to the local
         # convention.
         self.convert_paths('lib', 'purelib', 'platlib',
-                           'scripts', 'data', 'headers',
+                           'scripts', 'data', 'include',
                            'userbase', 'usersite')
 
         # Deprecated
@@ -392,7 +396,7 @@ class install(Command):
         # dirs relative to it.
         if self.root is not None:
             self.change_roots('libbase', 'lib', 'purelib', 'platlib',
-                              'scripts', 'data', 'headers')
+                              'scripts', 'data', 'include')
 
         self.dump_dirs("after prepending root")
 
@@ -429,7 +433,7 @@ class install(Command):
             if ((self.install_lib is None and
                  self.install_purelib is None and
                  self.install_platlib is None) or
-                self.install_headers is None or
+                self.install_include is None or
                 self.install_scripts is None or
                 self.install_data is None):
                 raise DistutilsOptionError(
@@ -517,7 +521,7 @@ class install(Command):
     def expand_dirs(self):
         """Calls `os.path.expanduser` on install dirs."""
         self._expand_attrs(['install_purelib', 'install_platlib',
-                            'install_lib', 'install_headers',
+                            'install_lib', 'install_include',
                             'install_scripts', 'install_data',])
 
     def convert_paths(self, *names):