Skip to content
Snippets Groups Projects
Commit c8a033219ba0 authored by Alain Leufroy's avatar Alain Leufroy
Browse files

[pkg] fix bug for NO_SETUPTOOLS

parent 42f52b055a68
No related branches found
No related tags found
No related merge requests found
...@@ -174,7 +174,8 @@ ...@@ -174,7 +174,8 @@
# install-layout option was introduced in 2.5.3-1~exp1 # install-layout option was introduced in 2.5.3-1~exp1
elif sys.version_info < (2, 5, 4) and '--install-layout=deb' in sys.argv: elif sys.version_info < (2, 5, 4) and '--install-layout=deb' in sys.argv:
sys.argv.remove('--install-layout=deb') sys.argv.remove('--install-layout=deb')
cmdclass = {'install_lib': MyInstallLib}
if USE_SETUPTOOLS: if USE_SETUPTOOLS:
kwargs['install_requires'] = install_requires kwargs['install_requires'] = install_requires
kwargs['dependency_links'] = dependency_links kwargs['dependency_links'] = dependency_links
kwargs['zip_safe'] = False kwargs['zip_safe'] = False
...@@ -177,7 +178,9 @@ ...@@ -177,7 +178,9 @@
if USE_SETUPTOOLS: if USE_SETUPTOOLS:
kwargs['install_requires'] = install_requires kwargs['install_requires'] = install_requires
kwargs['dependency_links'] = dependency_links kwargs['dependency_links'] = dependency_links
kwargs['zip_safe'] = False kwargs['zip_safe'] = False
cmdclass['install_data'] = MyInstallData
return setup(name = distname, return setup(name = distname,
version = version, version = version,
license = license, license = license,
...@@ -189,8 +192,7 @@ ...@@ -189,8 +192,7 @@
scripts = ensure_scripts(scripts), scripts = ensure_scripts(scripts),
data_files = data_files, data_files = data_files,
ext_modules = ext_modules, ext_modules = ext_modules,
cmdclass = {'install_lib': MyInstallLib, cmdclass = cmdclass,
'install_data':MyInstallData},
**kwargs **kwargs
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment