Update changelog.

[youtubedl] / setup.py

diff --git a/setup.py b/setup.py
index 6d019dcbb6e24a982611a2e26be1b62997bc2bf3..61435fcb7c36f4f60cba2b7cf82002a6a36ace54 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,10 +2,15 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function

-from distutils.core import setup
+

 import pkg_resources
 import sys
 
 import pkg_resources
 import sys
 

+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+

 try:
     import py2exe
     """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
 try:
     import py2exe
     """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""


@@ -19,7 +24,7 @@ py2exe_options = {
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',

-    "dll_excludes": ['w9xpopen.exe']
+    "dll_excludes": ['w9xpopen.exe'],

 }
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
 }
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",


@@ -53,7 +58,7 @@ setup(
     author = 'Ricardo Garcia',
     maintainer = 'Philipp Hagemeister',
     maintainer_email = 'phihag@phihag.de',
     author = 'Ricardo Garcia',
     maintainer = 'Philipp Hagemeister',
     maintainer_email = 'phihag@phihag.de',

-    packages = ['youtube_dl'],
+    packages = ['youtube_dl', 'youtube_dl.extractor'],

 
     # Provokes warning on most systems (why?!)
     #test_suite = 'nose.collector',
 
     # Provokes warning on most systems (why?!)
     #test_suite = 'nose.collector',