X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=Makefile;h=470717a927cb55193d4602395ffbaa10df68274a;hb=cc51a7d4e030646a5d7075934f11036ad52a3f1f;hp=625948211d1b12700c0d88a84dae630fd7c20326;hpb=85f76ac90ba36bdf408a6dc6d54c613de136e0bb;p=youtube-dl

diff --git a/Makefile b/Makefile
index 625948211..470717a92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,30 @@
-all: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
-
+all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion 
 # 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
+	rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/
 
 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 $(PREFIX)/bin/
-	install -m 644 --owner root --group root youtube-dl.1 $(PREFIX)/man/man1
-	install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl
+	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 README.md youtube-dl.bash-completion
-# TODO un-phone README.md and youtube-dl.bash_completion by reading from .in files and generating from them
+.PHONY: all clean install test
 
 youtube-dl: youtube_dl/*.py
-	zip --quiet --junk-paths youtube-dl youtube_dl/*.py
+	zip --quiet youtube-dl youtube_dl/*.py
+	zip --quiet --junk-paths youtube-dl youtube_dl/__main__.py
 	echo '#!/usr/bin/env python' > youtube-dl
 	cat youtube-dl.zip >> youtube-dl
 	rm youtube-dl.zip
@@ -24,25 +33,25 @@ youtube-dl: youtube_dl/*.py
 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
 
+README.txt: README.md
+	pandoc -f markdown -t plain README.md -o README.txt
+
 youtube-dl.1: README.md
-	pandoc -s -w man README.md -o youtube-dl.1
+	pandoc -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md
+youtube-dl.bash-completion: README.md youtube-dl.bash-completion.in
 	@options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
-		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \
+		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion.in` && \
 		echo "$${content}" > youtube-dl.bash-completion
-
-LATEST_VERSION: youtube-dl
-	./youtube-dl --version > LATEST_VERSION