aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-17 00:55:06 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-17 00:55:06 +0200
commit38604f1a4f26c78b69898c639a8f75432c2d3382 (patch)
tree5676f6829bd207212353eeaeb8e7a96d48fd18b4 /Makefile
parent2d0efe70a684cf378c6c325eafc8e52a85321157 (diff)
parentbfd14b1b2fdf1f0e54e639f9695f73edf578e241 (diff)
downloadyoutube-dl-38604f1a4f26c78b69898c639a8f75432c2d3382.tar.xz
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 85dacfa4c..c6d09932b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,13 +13,13 @@ PYTHON=/usr/bin/env python
# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
ifeq ($(PREFIX),/usr)
- SYSCONFDIR=/etc
+ SYSCONFDIR=/etc
else
- ifeq ($(PREFIX),/usr/local)
- SYSCONFDIR=/etc
- else
- SYSCONFDIR=$(PREFIX)/etc
- endif
+ ifeq ($(PREFIX),/usr/local)
+ SYSCONFDIR=/etc
+ else
+ SYSCONFDIR=$(PREFIX)/etc
+ endif
endif
install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
@@ -71,6 +71,7 @@ youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-
--exclude '*~' \
--exclude '__pycache' \
--exclude '.git' \
+ --exclude 'testdata' \
-- \
bin devscripts test youtube_dl \
CHANGELOG LICENSE README.md README.txt \