Revert "[Makefilea] Fix for GNU make < 4"

This reverts commit 831a34caa2112a9b2d867e05f8a4debf965e8389.

The reverted commit breaks lazy extractors.

diff --git a/ChangeLog b/ChangeLog
index be1cf90fb874bf25f0ee04c1ab4142c13f0a3b1d..4f64edabb0255183a3ee62b204e46269d7535bd3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-version <unreleased>
-
-Core
-* Support for GNU make < 4 is fixed (#9387)
-
-
 version 2016.10.02
 
 Core

diff --git a/Makefile b/Makefile
index 7393e3e1e33bd8c2ed38fcb0ad973d5e959bcf05..a2763a664188102662cc4f2c5b69518cc6664693 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 $@