瀏覽代碼

[Makefile] Fix for GNU make < 4 (closes #9387)

Shell assignment operator in BSD make != is ported to GNU make in
version 4.0, so 3.x doesn't work. I choose to drop BSD make support as
installing GNU make on *BSD systems is easier than installing newer GNU
make.
Yen Chi Hsuan 9 年之前
父節點
當前提交
8204c73352
共有 3 個文件被更改,包括 9 次插入3 次删除
  1. 6 0
      ChangeLog
  2. 2 2
      Makefile
  3. 1 1
      README.md

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+version <unreleased>
+
+Core
+* [Makefile] Support for GNU make < 4 is fixed; BSD make dropped (#9387)
+
+
 version 2016.10.07
 version 2016.10.07
 
 
 Extractors
 Extractors

+ 2 - 2
Makefile

@@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share
 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 != 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)
 
 
 install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
 install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
 	install -d $(DESTDIR)$(BINDIR)
 	install -d $(DESTDIR)$(BINDIR)
@@ -90,7 +90,7 @@ fish-completion: youtube-dl.fish
 
 
 lazy-extractors: youtube_dl/extractor/lazy_extractors.py
 lazy-extractors: youtube_dl/extractor/lazy_extractors.py
 
 
-_EXTRACTOR_FILES != find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py'
+_EXTRACTOR_FILES = $(shell 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)
 youtube_dl/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
 	$(PYTHON) devscripts/make_lazy_extractors.py $@
 	$(PYTHON) devscripts/make_lazy_extractors.py $@
 
 

+ 1 - 1
README.md

@@ -923,7 +923,7 @@ To run the test, simply invoke your favorite test runner, or execute a test file
 If you want to create a build of youtube-dl yourself, you'll need
 If you want to create a build of youtube-dl yourself, you'll need
 
 
 * python
 * python
-* make (both GNU make and BSD make are supported)
+* make (only GNU make is supported)
 * pandoc
 * pandoc
 * zip
 * zip
 * nosetests
 * nosetests