[Python-checkins] CVS: distutils/examples numpy_setup.py,1.7,1.8

[Greg Ward]

Update of /cvsroot/python/distutils/examples
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20035

Modified Files:
	numpy_setup.py 
Log Message:
No need for a custom "install" command -- now we can take advantage of
the standard "install_headers" command.

Index: numpy_setup.py
===================================================================
RCS file: /cvsroot/python/distutils/examples/numpy_setup.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** numpy_setup.py	2000/04/10 01:34:29	1.7
--- numpy_setup.py	2000/05/30 03:02:02	1.8
***************
*** 20,47 ****
  headers = glob (os.path.join ("Include","*.h"))
  
- class my_install (install):
- 
-     user_options = install.user_options + \
-               [('install-header=', None,
-                 "C header file installation directory")]
- 
-     def initialize_options (self):
-         install.initialize_options (self)
-         self.install_header = None
- 
-     def finalize_options (self):
-         install.finalize_options (self)
-         if self.install_header is None:
-             inc_base = get_python_inc (prefix=self.install_base)
-             self.install_header = os.path.join (inc_base, "Numeric")
- 
-     def run (self):
-         global headers
- 
-         install.run (self)
-         self.mkpath (self.install_header)
-         for header in headers:
-             self.copy_file (header, self.install_header)
- 
  setup (name = "Numerical",
         version = "15.2",
--- 20,23 ----
***************
*** 51,59 ****
         url = "http://numpy.sourceforge.net",
  
-        cmdclass = {'install': my_install},
         packages = [''],
         package_dir = {'': 'Lib'},
         extra_path = 'Numeric',
         include_dirs = ['Include'],
         ext_modules = [('_numpy',
                         { 'sources' : ['Src/_numpymodule.c',
--- 27,35 ----
         url = "http://numpy.sourceforge.net",
  
         packages = [''],
         package_dir = {'': 'Lib'},
         extra_path = 'Numeric',
         include_dirs = ['Include'],
+        headers = headers,
         ext_modules = [('_numpy',
                         { 'sources' : ['Src/_numpymodule.c',