X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=setup.py;h=9c40154abd5e0da9f76bc70f8ce74cce4f20a236;hb=131842bb0b96551c3c9e0cf479f8537d32e5ad0c;hp=6d019dcbb6e24a982611a2e26be1b62997bc2bf3;hpb=95eb771dcda47f948b050da85c7ff22539e3ee12;p=youtube-dl

diff --git a/setup.py b/setup.py
index 6d019dcbb..9c40154ab 100644
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,19 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
-from distutils.core import setup
+
 import pkg_resources
 import sys
 
 try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+try:
+    # This will create an exe that needs Microsoft Visual C++ 2008
+    # Redistributable Package
     import py2exe
-    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
 except ImportError:
     if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
         print("Cannot import py2exe", file=sys.stderr)
@@ -19,7 +25,7 @@ py2exe_options = {
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',
-    "dll_excludes": ['w9xpopen.exe']
+    "dll_excludes": ['w9xpopen.exe'],
 }
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
@@ -53,7 +59,7 @@ setup(
     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',