Changeset View
Changeset View
Standalone View
Standalone View
www/youtube_dl/files/patch-Makefile
| --- Makefile.orig 2018-05-09 02:36:21 UTC | --- Makefile.orig 2019-12-24 22:21:59.865317000 +0100 | ||||
| +++ Makefile | +++ Makefile 2019-12-24 22:24:39.962172000 +0100 | ||||
| @@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share | @@ -12,7 +12,7 @@ | ||||
| PYTHON ?= /usr/bin/env python | PYTHON ?= /usr/bin/env python | ||||
| # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local | # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local | ||||
| -SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi) | -SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi) | ||||
| +SYSCONFDIR ?= $(PREFIX)/etc | +SYSCONFDIR ?= $(PREFIX)/etc | ||||
| # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2 | # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2 | ||||
| MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi) | MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi) | ||||
| @@ -23,11 +23,11 @@ install: youtube-dl youtube-dl.1 youtube | @@ -23,11 +23,11 @@ | ||||
| install -d $(DESTDIR)$(MANDIR)/man1 | install -d $(DESTDIR)$(MANDIR)/man1 | ||||
| install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1 | install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1 | ||||
| install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d | install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d | ||||
| - install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl | - install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl | ||||
| + install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl.sh | + install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl.sh | ||||
| install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions | install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions | ||||
| install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl | install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl | ||||
| - install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions | - install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions | ||||
| - install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish | - install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish | ||||
| + install -d $(DESTDIR)$(SHAREDIR)/fish/completions | + install -d $(DESTDIR)$(SHAREDIR)/fish/completions | ||||
| + install -m 644 youtube-dl.fish $(DESTDIR)$(SHAREDIR)/fish/completions/youtube-dl.fish | + install -m 644 youtube-dl.fish $(DESTDIR)$(SHAREDIR)/fish/completions/youtube-dl.fish | ||||
| codetest: | codetest: | ||||
| flake8 . | flake8 . | ||||
| @@ -87,11 +87,6 @@ supportedsites: | @@ -65,7 +65,7 @@ | ||||
| done | |||||
| touch -t 200001010101 zip/youtube_dl/*.py zip/youtube_dl/*/*.py | |||||
| mv zip/youtube_dl/__main__.py zip/ | |||||
| - cd zip ; zip -q ../youtube-dl youtube_dl/*.py youtube_dl/*/*.py __main__.py | |||||
| + cd zip ; bsdtar -a -cf ../youtube-dl.zip youtube_dl/*.py youtube_dl/*/*.py __main__.py | |||||
| rm -rf zip | |||||
| echo '#!$(PYTHON)' > youtube-dl | |||||
| cat youtube-dl.zip >> youtube-dl | |||||
| @@ -90,11 +90,6 @@ | |||||
| README.txt: README.md | README.txt: README.md | ||||
| pandoc -f $(MARKDOWN) -t plain README.md -o README.txt | pandoc -f $(MARKDOWN) -t plain README.md -o README.txt | ||||
| - | |||||
| -youtube-dl.1: README.md | -youtube-dl.1: README.md | ||||
| - $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.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 | - rm -f youtube-dl.1.temp.md | ||||
| - | |||||
| youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in | youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in | ||||
| $(PYTHON) devscripts/bash-completion.py | $(PYTHON) devscripts/bash-completion.py | ||||