From 039dc61bd2a7ca8a1716ce57e9d4c8f80fbc8aee Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 6 Jan 2013 23:02:31 +0100
Subject: [PATCH] Simplify Makefile

---
 .tarignore | 17 -----------------
 Makefile   | 25 ++++++++++++++++++++++---
 2 files changed, 22 insertions(+), 20 deletions(-)
 delete mode 100644 .tarignore

diff --git a/.tarignore b/.tarignore
deleted file mode 100644
index 986afeed6..000000000
--- a/.tarignore
+++ /dev/null
@@ -1,17 +0,0 @@
-updates_key.pem
-*.pyc
-*.pyo
-youtube-dl.exe
-wine-py2exe/
-py2exe.log
-*.kate-swp
-build/
-dist/
-MANIFEST
-*.DS_Store
-youtube-dl.tar.gz
-.coverage
-cover/
-__pycache__/
-.git/
-*~
diff --git a/Makefile b/Makefile
index 0069e7975..b629304e5 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,9 @@ test:
 	#nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
 	nosetests --verbose test
 
-.PHONY: all clean install test
+tar: youtube-dl.tar.gz
+
+.PHONY: all clean install test tar
 
 youtube-dl: youtube_dl/*.py
 	zip --quiet youtube-dl youtube_dl/*.py
@@ -43,5 +45,22 @@ youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.in
 	python devscripts/bash-completion.py
 
 youtube-dl.tar.gz: all
-	tar -cvzf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \
-		--exclude-from=".tarignore" -- .
+	@tar -czf youtube-dl.tar.gz --transform "s|^./|./youtube-dl/|" --owner 0 --group 0 \
+		--exclude-vcs \
+		--exclude '*.DS_Store' \
+		--exclude '*.kate-swp' \
+		--exclude '*.pyc' \
+		--exclude '*.pyo' \
+		--exclude '*~' \
+		--exclude '__pycache' \
+		--exclude 'build' \
+		--exclude 'cover' \
+		--exclude '.coverage' \
+		--exclude 'dist' \
+		--exclude 'MANIFEST' \
+		--exclude 'py2exe.log' \
+		--exclude 'updates_key.pem' \
+		--exclude 'wine-py2exe' \
+		--exclude 'youtube-dl.exe' \
+		--exclude 'youtube-dl.tar.gz' \
+		-- .