Merge tag 'upstream/2014.01.17.2'

[youtubedl] / Makefile

diff --git a/Makefile b/Makefile
index 85dacfa4c31f2b83860891d6339b8b4a0e48c6b7..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)
 
 # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
 ifeq ($(PREFIX),/usr)

-    SYSCONFDIR=/etc
+       SYSCONFDIR=/etc

 else
 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
 endif
 
 install: youtube-dl youtube-dl.1 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 '*~' \
                --exclude '__pycache' \
                --exclude '.git' \

+               --exclude 'testdata' \

                -- \
                bin devscripts test youtube_dl \
                CHANGELOG LICENSE README.md README.txt \
                -- \
                bin devscripts test youtube_dl \
                CHANGELOG LICENSE README.md README.txt \