X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=setup.py;h=55fc1c839d38db3248d28fb97186ad21c785a880;hb=b0dcc3c47f086e69b72e1d9724ef83e7ca36e435;hp=6d019dcbb6e24a982611a2e26be1b62997bc2bf3;hpb=258d5850c91e0d37a36c6bae0a25314f8149b05a;p=youtube-dl.git

diff --git a/setup.py b/setup.py
index 6d019dcbb..55fc1c839 100644
--- a/setup.py
+++ b/setup.py
@@ -2,10 +2,14 @@
 # -*- 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:
     import py2exe
     """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
@@ -53,7 +57,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',