commit 8179d2ba7495bddbd84016467218cea3fcd32281
parent df4bad32454164552716da994f9a578178d918fd
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 26 Nov 2012 23:25:04 +0100
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat:
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
@@ -17,7 +17,10 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
-.PHONY: all clean install README.md youtube-dl.bash-completion
+test:
+ nosetests2 --nocapture test
+
+.PHONY: all clean install test README.md youtube-dl.bash-completion
# TODO un-phony README.md and youtube-dl.bash_completion by reading from .in files and generating from them
youtube-dl: youtube_dl/*.py
@@ -52,8 +55,3 @@ youtube-dl.bash-completion: README.md
LATEST_VERSION: youtube_dl/__init__.py
python -m youtube_dl --version > LATEST_VERSION
-
-test:
- nosetests2 --nocapture test
-
-.PHONY: default compile update update-latest update-readme test clean
diff --git a/README.md b/README.md
@@ -151,7 +151,7 @@ Please note that Python 2.5 is not supported anymore.
### What is this binary file? Where has the code gone?
-Since June 2012 (#342) youtube-dl is packed as an executable zipfile, simply unzip it (might need renaming to `youtube-dl.zip` first on some systems) or clone the git repo to see the code. If you modify the code, you can run it by executing the `__main__.py` file. To recompile the executable, run `make compile`.
+Since June 2012 (#342) youtube-dl is packed as an executable zipfile, simply unzip it (might need renaming to `youtube-dl.zip` first on some systems) or clone the git repo to see the code. If you modify the code, you can run it by executing the `__main__.py` file. To recompile the executable, run `make youtube-dl`.
### The exe throws a *Runtime error from Visual C++*
diff --git a/youtube-dl.1 b/youtube-dl.1
@@ -213,7 +213,7 @@ simply unzip it (might need renaming to \f[C]youtube-dl.zip\f[] first on
some systems) or clone the git repo to see the code.
If you modify the code, you can run it by executing the
\f[C]__main__.py\f[] file.
-To recompile the executable, run \f[C]make\ compile\f[].
+To recompile the executable, run \f[C]make\ youtube-dl\f[].
.SS The exe throws a \f[I]Runtime error from Visual C++\f[]
.PP
To run the exe you need to install first the Microsoft Visual C++ 2008
