Merge remote-tracking branch 'gcmalloc/master' into fork_master

[youtube-dl] / Makefile

diff --git a/Makefile b/Makefile
index c97d6ffb005d9561dc2fede6f613d026d9c0924e..818d93bdbee417c853fd3e0670d12e942a1866f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,8 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
        install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
 
 test:
-       nosetests2 --nocapture test
+       #nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
+       nosetests --verbose test
 
 .PHONY: all clean install test
 
@@ -38,7 +39,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.template
+youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.in
        python devscripts/bash-completion.py
 
 youtube-dl.tar.gz: all