Document configuration

[youtube-dl] / Makefile

diff --git a/Makefile b/Makefile
index 4677ff684ae033fe2cccafd82b3d5cb632a3566d..a0262153427aaab26c94bfceea0096c321bbf365 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,17 @@ 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
 
 .PHONY: all clean install 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
@@ -26,13 +33,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
@@ -47,6 +54,6 @@ LATEST_VERSION: youtube_dl/__init__.py
        python -m youtube_dl --version > LATEST_VERSION
 
 test:
-       nosetests2 test
+       nosetests2 --nocapture test
 
 .PHONY: default compile update update-latest update-readme test clean