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

diff --git a/Makefile b/Makefile
index f52dd1dd6..c4937a512 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,26 @@ 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 $(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
+.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
@@ -26,13 +36,13 @@ youtube-dl.exe: youtube_dl/*.py
 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
@@ -45,11 +55,3 @@ youtube-dl.bash-completion: README.md
 
 LATEST_VERSION: youtube_dl/__init__.py
 	python -m youtube_dl --version > LATEST_VERSION
-
-test:
-	nosetests2 test/*
-
-clean:
-	$$(rm **/*.pyc)
-
-.PHONY: default compile update update-latest update-readme test clean