From df2e1f7df4296e32f9597f6a78eac27f544ca12b Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 24 Jun 2010 20:31:41 +0200
Subject: Makefile: simplification

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 57db7b11..1b26e117 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 NAME = ranger
-VERSION = $(shell cat README | grep -m 1 -o '[0-9][0-9.]\+')
+VERSION = $(shell grep -m 1 -o '[0-9][0-9.]\+' README)
 SNAPSHOT_NAME ?= $(NAME)-$(VERSION)-$(shell git rev-parse HEAD | cut -b 1-8).tar.gz
 # Find suitable python version (need python >= 2.6 or 3.1):
 PYTHON ?= $(shell python -c 'import sys; sys.exit(sys.version < "2.6")' && \
-- 
cgit 1.4.1-2-gfad0


From 27eec7c6b53303acfd7713f7cc696ea50894a6b1 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Sat, 11 Sep 2010 22:56:00 +0200
Subject: Makefile, setup.py: Fixed `make doc`

---
 Makefile |  1 -
 setup.py | 47 ++++++++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1b26e117..fd525721 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,6 @@ doc: cleandoc
 		$(PYTHON) -c 'import pydoc, sys; \
 		sys.path[0] = "$(CWD)"; \
 		pydoc.writedocs("$(CWD)")'
-	rm $(DOCDIR)/test*
 	find . -name \*.html -exec sed -i 's|'$(CWD)'|../..|g' -- {} \;
 
 cleandoc:
diff --git a/setup.py b/setup.py
index 17cfc660..587b52c0 100755
--- a/setup.py
+++ b/setup.py
@@ -17,26 +17,27 @@
 import distutils.core
 import ranger
 
-distutils.core.setup(
-	name='ranger',
-	description='Vim-like file manager',
-	version=ranger.__version__,
-	author=ranger.__author__,
-	author_email=ranger.__email__,
-	license=ranger.__license__,
-	url='http://savannah.nongnu.org/projects/ranger',
-	scripts=['scripts/ranger'],
-	data_files=[('share/man/man1', ['doc/ranger.1'])],
-	package_data={'ranger': ['data/*']},
-	packages=('ranger',
-	          'ranger.api',
-	          'ranger.colorschemes',
-	          'ranger.container',
-	          'ranger.core',
-	          'ranger.defaults',
-	          'ranger.ext',
-	          'ranger.fsobject',
-	          'ranger.gui',
-	          'ranger.gui.widgets',
-	          'ranger.help',
-	          'ranger.shared'))
+if __name__ == '__main__':
+	distutils.core.setup(
+		name='ranger',
+		description='Vim-like file manager',
+		version=ranger.__version__,
+		author=ranger.__author__,
+		author_email=ranger.__email__,
+		license=ranger.__license__,
+		url='http://savannah.nongnu.org/projects/ranger',
+		scripts=['scripts/ranger'],
+		data_files=[('share/man/man1', ['doc/ranger.1'])],
+		package_data={'ranger': ['data/*']},
+		packages=('ranger',
+		          'ranger.api',
+		          'ranger.colorschemes',
+		          'ranger.container',
+		          'ranger.core',
+		          'ranger.defaults',
+		          'ranger.ext',
+		          'ranger.fsobject',
+		          'ranger.gui',
+		          'ranger.gui.widgets',
+		          'ranger.help',
+		          'ranger.shared'))
-- 
cgit 1.4.1-2-gfad0