diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-10-07 16:02:53 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-10-07 16:03:34 +0800 |
| commit | c0a7b9b348bb580d32fc94ee90c1b3b02b668a9e (patch) | |
| tree | 33ef39857eadda05d4242e7225056a616579a548 | |
| parent | 831a34caa2112a9b2d867e05f8a4debf965e8389 (diff) | |
Revert "[Makefilea] Fix for GNU make < 4"
This reverts commit 831a34caa2112a9b2d867e05f8a4debf965e8389.
The reverted commit breaks lazy extractors.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 2 insertions, 8 deletions
@@ -1,9 +1,3 @@ -version <unreleased> - -Core -* Support for GNU make < 4 is fixed (#9387) - - version 2016.10.02 Core @@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share PYTHON ?= /usr/bin/env python # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local -SYSCONFDIR = $$(if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi) +SYSCONFDIR != if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish install -d $(DESTDIR)$(BINDIR) @@ -90,7 +90,7 @@ fish-completion: youtube-dl.fish lazy-extractors: youtube_dl/extractor/lazy_extractors.py -_EXTRACTOR_FILES = $$(find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py') +_EXTRACTOR_FILES != find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py' youtube_dl/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES) $(PYTHON) devscripts/make_lazy_extractors.py $@ |