diff options
| author | hut <hut@lavabit.com> | 2010-10-05 21:30:15 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-10-05 21:30:15 +0200 |
| commit | 258a2668e6cdd34351979b8da17c6e66a738996e (patch) | |
| tree | cd3406c2198daced1f12cb11c4091fa1ed99dd4c /Makefile | |
| parent | dc7ee19fc15eee33c948d0ccd6c06df9682c0bf3 (diff) | |
| parent | d3bcb234bf5776da7d9b66e73107e906342eeb7d (diff) | |
| download | ranger-258a2668e6cdd34351979b8da17c6e66a738996e.tar.gz | |
Merge branch 'stable' into preview
Conflicts: ranger/shared/settings.py
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile index 57db7b11..fd525721 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")' && \ @@ -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: |