--- youtube-dl-2015.03.09/Makefile.orig 2015-03-11 01:22:06.331608738 +0200 +++ youtube-dl-2015.03.09/Makefile 2015-03-11 01:33:42.747902336 +0200 @@ -4,22 +4,23 @@ rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe find -name "*.pyc" -delete -PREFIX ?= /usr/local +PREFIX ?= BINDIR ?= $(PREFIX)/bin MANDIR ?= $(PREFIX)/man SHAREDIR ?= $(PREFIX)/share -PYTHON ?= /usr/bin/env python +PYTHON ?= /usr/bin/python +SYSCONFDIR=/etc # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local -ifeq ($(PREFIX),/usr) - SYSCONFDIR=/etc -else - ifeq ($(PREFIX),/usr/local) - SYSCONFDIR=/etc - else - SYSCONFDIR=$(PREFIX)/etc - endif -endif +#ifeq ($(PREFIX),/usr) +# SYSCONFDIR=/etc +#else +# ifeq ($(PREFIX),/usr/local) +# SYSCONFDIR=/etc +# else +# SYSCONFDIR=$(PREFIX)/etc +# endif +#endif install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish install -d $(DESTDIR)$(BINDIR) @@ -50,7 +51,7 @@ .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites -pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1 youtube-dl.fish +pypi-files: youtube-dl.bash-completion README.md youtube-dl.1 youtube-dl.fish youtube-dl: youtube_dl/*.py youtube_dl/*/*.py zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py @@ -70,11 +71,11 @@ python devscripts/make_supportedsites.py docs/supportedsites.md README.txt: README.md - pandoc -f markdown -t plain README.md -o README.txt + # pandoc -f markdown -t plain README.md -o youtube-dl.1: README.md python devscripts/prepare_manpage.py >youtube-dl.1.temp.md - pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1 + # pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1 rm -f youtube-dl.1.temp.md youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in @@ -92,7 +93,7 @@ fish-completion: youtube-dl.fish -youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish +youtube-dl.tar.gz: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish @tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \ --exclude '*.DS_Store' \ --exclude '*.kate-swp' \ @@ -105,7 +106,7 @@ --exclude 'docs/_build' \ -- \ bin devscripts test youtube_dl docs \ - LICENSE README.md README.txt \ + LICENSE README.md \ Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \ youtube-dl.zsh youtube-dl.fish setup.py \ youtube-dl --- youtube-dl-2015.03.09/setup.orig.py 2015-03-11 01:21:28.928076346 +0200 +++ youtube-dl-2015.03.09/setup.py 2015-03-11 01:37:37.112972370 +0200 @@ -6,6 +6,8 @@ import os.path import warnings import sys +from youtube_dl.version import __version__ + try: from setuptools import setup @@ -46,10 +48,8 @@ params = py2exe_params else: files_spec = [ - ('etc/bash_completion.d', ['youtube-dl.bash-completion']), - ('etc/fish/completions', ['youtube-dl.fish']), - ('share/doc/youtube_dl', ['README.txt']), - ('share/man/man1', ['youtube-dl.1']) + ('/etc/bash_completion.d', ['youtube-dl.bash-completion']), + ('/etc/fish/completions', ['youtube-dl.fish']) ] root = os.path.dirname(os.path.abspath(__file__)) data_files = []