X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=Makefile;h=c4937a51221649ce667dc738aa49217e1729f157;hb=4efe62a0167a0e82e8aaf25b00294dd281b555c9;hp=26c85b57809f7d7a4ed899a67d7c0c31d7bffbe3;hpb=dce1088450becaa95e7fcaea2c70e8965b142a69;p=youtube-dl

diff --git a/Makefile b/Makefile
index 26c85b578..c4937a512 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,48 @@
-all: youtube-dl youtube-dl.exe README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
+all: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
+# TODO: re-add youtube-dl.exe, and make sure it's 1. safe and 2. doesn't need sudo
+
+clean:
+	rm -f youtube-dl youtube-dl.exe youtube-dl.1 LATEST_VERSION
+
+PREFIX=/usr/local
+BINDIR=$(PREFIX)/bin
+MANDIR=$(PREFIX)/man
+SYSCONFDIR=/etc
 
 install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
-	install -m 755 --owner root --group root youtube-dl /usr/local/bin/
-	install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1
-	install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl
-
-release:
-	@if [ -z "$$version" ]; then echo 'ERROR: specify version number like this: make release version=1994.09.06'; exit 1; fi
-	@if [ ! -z "`git tag | grep "$$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi
-	@if [ ! -z "`git status --porcelain`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi
-	@sed -i "s/__version__ = '.*'/__version__ = '$$version'/" youtube_dl/__init__.py
-	make all
-	git add -A
-	git commit -m "release $$version"
-	git tag -m "Release $$version" "$$version"
-
-.PHONY: all install release
+	install -d $(DESTDIR)$(BINDIR)
+	install -m 755 youtube-dl $(DESTDIR)$(BINDIR)
+	install -d $(DESTDIR)$(MANDIR)/man1
+	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
+	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
+	install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
+
+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
-	zip --quiet --junk-paths youtube-dl youtube_dl/*.py
+	zip --quiet youtube-dl __main__.py youtube_dl/*.py
 	echo '#!/usr/bin/env python' > youtube-dl
 	cat youtube-dl.zip >> youtube-dl
 	rm youtube-dl.zip
+	chmod a+x youtube-dl
 
 youtube-dl.exe: youtube_dl/*.py
 	bash devscripts/wine-py2exe.sh build_exe.py
 
-README.md: youtube-dl
-	@options=$$(COLUMNS=80 ./youtube-dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \
+README.md: youtube_dl/*.py
+	@options=$$(COLUMNS=80 python -m youtube_dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \
 		header=$$(sed -e '/.*# OPTIONS/,$$ d' README.md) && \
-		footer=$$(sed -e '1,/.*# FAQ/ d' README.md) && \
+		footer=$$(sed -e '1,/.*# CONFIGURATION/ d' README.md) && \
 		echo "$${header}" > README.md && \
 		echo >> README.md && \
 		echo '# OPTIONS' >> README.md && \
 		echo "$${options}" >> README.md&& \
 		echo >> README.md && \
-		echo '# FAQ' >> README.md && \
+		echo '# CONFIGURATION' >> README.md && \
 		echo "$${footer}" >> README.md
 
 youtube-dl.1: README.md
@@ -46,5 +53,5 @@ youtube-dl.bash-completion: README.md
 		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \
 		echo "$${content}" > youtube-dl.bash-completion
 
-LATEST_VERSION: youtube-dl
-	./youtube-dl --version > LATEST_VERSION
+LATEST_VERSION: youtube_dl/__init__.py
+	python -m youtube_dl --version > LATEST_VERSION