Merge tag 'upstream/2013.10.23'

[youtubedl] / Makefile

diff --git a/Makefile b/Makefile
index e00f5e6503525d631e36b9f83de0be5716d2d786..c6d09932bcd4f45b8910e828255703403c2df0d7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,13 +13,13 @@ PYTHON=/usr/bin/env python
 
 # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
 ifeq ($(PREFIX),/usr)
-    SYSCONFDIR=/etc
+       SYSCONFDIR=/etc
 else
-    ifeq ($(PREFIX),/usr/local)
-        SYSCONFDIR=/etc
-    else
-        SYSCONFDIR=$(PREFIX)/etc
-    endif
+       ifeq ($(PREFIX),/usr/local)
+               SYSCONFDIR=/etc
+       else
+               SYSCONFDIR=$(PREFIX)/etc
+       endif
 endif
 
 install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
@@ -40,15 +40,15 @@ tar: youtube-dl.tar.gz
 
 pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1
 
-youtube-dl: youtube_dl/*.py
-       zip --quiet youtube-dl youtube_dl/*.py
+youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
+       zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py
        zip --quiet --junk-paths youtube-dl youtube_dl/__main__.py
        echo '#!$(PYTHON)' > youtube-dl
        cat youtube-dl.zip >> youtube-dl
        rm youtube-dl.zip
        chmod a+x youtube-dl
 
-README.md: youtube_dl/*.py
+README.md: youtube_dl/*.py youtube_dl/*/*.py
        COLUMNS=80 python -m youtube_dl --help | python devscripts/make_readme.py
 
 README.txt: README.md
@@ -57,7 +57,7 @@ README.txt: README.md
 youtube-dl.1: README.md
        pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.in
+youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
        python devscripts/bash-completion.py
 
 bash-completion: youtube-dl.bash-completion
@@ -71,6 +71,7 @@ youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-
                --exclude '*~' \
                --exclude '__pycache' \
                --exclude '.git' \
+               --exclude 'testdata' \
                -- \
                bin devscripts test youtube_dl \
                CHANGELOG LICENSE README.md README.txt \