mirror of
				https://github.com/ytdl-org/youtube-dl.git
				synced 2025-10-29 09:26:20 -07:00 
			
		
		
		
	Revert "[Makefilea] Fix for GNU make < 4"
This reverts commit 831a34caa2.
The reverted commit breaks lazy extractors.
			
			
This commit is contained in:
		| @@ -1,9 +1,3 @@ | ||||
| version <unreleased> | ||||
|  | ||||
| Core | ||||
| * Support for GNU make < 4 is fixed (#9387) | ||||
|  | ||||
|  | ||||
| version 2016.10.02 | ||||
|  | ||||
| Core | ||||
|   | ||||
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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 $@ | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user