From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sun, 29 Nov 2015 05:08:46 +0000 (+0800)
Subject: Merge pull request #7691 from ryandesign/use-PYTHON-env-var
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=ef428960c9b3972586977446e82ec3872094cc1e;hp=-c

Merge pull request #7691 from ryandesign/use-PYTHON-env-var

Always use PYTHON env var in Makefile
---

ef428960c9b3972586977446e82ec3872094cc1e
diff --combined Makefile
index fdb1abb60,337a2eefb..f826c1685
--- a/Makefile
+++ b/Makefile
@@@ -1,8 -1,7 +1,8 @@@
  all: youtube-dl README.md CONTRIBUTING.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish supportedsites
  
  clean:
 -	rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
 +	rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
 +	find . -name "*.pyc" -delete
  
  PREFIX ?= /usr/local
  BINDIR ?= $(PREFIX)/bin
@@@ -44,7 -43,7 +44,7 @@@ test
  ot: offlinetest
  
  offlinetest: codetest
 -	nosetests --verbose test --exclude test_download --exclude test_age_restriction --exclude test_subtitles --exclude test_write_annotations --exclude test_youtube_lists
 +	nosetests --verbose test --exclude test_download.py --exclude test_age_restriction.py --exclude test_subtitles.py --exclude test_write_annotations.py --exclude test_youtube_lists.py
  
  tar: youtube-dl.tar.gz
  
@@@ -61,34 -60,34 +61,34 @@@ youtube-dl: youtube_dl/*.py youtube_dl/
  	chmod a+x youtube-dl
  
  README.md: youtube_dl/*.py youtube_dl/*/*.py
- 	COLUMNS=80 python youtube_dl/__main__.py --help | python devscripts/make_readme.py
+ 	COLUMNS=80 $(PYTHON) youtube_dl/__main__.py --help | $(PYTHON) devscripts/make_readme.py
  
  CONTRIBUTING.md: README.md
- 	python devscripts/make_contributing.py README.md CONTRIBUTING.md
+ 	$(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
  
  supportedsites:
- 	python devscripts/make_supportedsites.py docs/supportedsites.md
+ 	$(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md
  
  README.txt: README.md
  	pandoc -f markdown -t plain README.md -o README.txt
  
  youtube-dl.1: README.md
- 	python devscripts/prepare_manpage.py >youtube-dl.1.temp.md
+ 	$(PYTHON) devscripts/prepare_manpage.py >youtube-dl.1.temp.md
  	pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
  	rm -f youtube-dl.1.temp.md
  
  youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
- 	python devscripts/bash-completion.py
+ 	$(PYTHON) devscripts/bash-completion.py
  
  bash-completion: youtube-dl.bash-completion
  
  youtube-dl.zsh: youtube_dl/*.py youtube_dl/*/*.py devscripts/zsh-completion.in
- 	python devscripts/zsh-completion.py
+ 	$(PYTHON) devscripts/zsh-completion.py
  
  zsh-completion: youtube-dl.zsh
  
  youtube-dl.fish: youtube_dl/*.py youtube_dl/*/*.py devscripts/fish-completion.in
- 	python devscripts/fish-completion.py
+ 	$(PYTHON) devscripts/fish-completion.py
  
  fish-completion: youtube-dl.fish