diff options
| author | hut <hut@lavabit.com> | 2010-06-09 14:10:06 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-06-09 14:10:06 +0200 |
| commit | a4c9208bb69b09207c017ae88c810ef0ee83a780 (patch) | |
| tree | 1666c23d6d69481587d26669c790b278123b1f0a /Makefile | |
| parent | 1d895690f81f2cb3a308416c29b280e91e681e36 (diff) | |
| parent | e74222ee48435895a636812f908c862f3fb7acb6 (diff) | |
| download | ranger-a4c9208bb69b09207c017ae88c810ef0ee83a780.tar.gz | |
Merge branch 'master' into preview
Conflicts: ranger/fsobject/file.py
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile index 6a103a02..dc030b5a 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. NAME = ranger -VERSION = 1.0.4 +VERSION = $(shell cat README | grep -m 1 -o '[0-9][0-9.]\+') PYTHON ?= python DOCDIR ?= doc/pydoc PREFIX ?= /usr @@ -100,10 +100,10 @@ cleandoc: test -d $(DOCDIR) && rm -f -- $(DOCDIR)/*.html test: - @$(PYTHON) all_tests.py 1 + @$(PYTHON) test/all_tests.py 1 bm: - @$(PYTHON) all_benchmarks.py $(BMCOUNT) + @$(PYTHON) test/all_benchmarks.py $(BMCOUNT) snapshot: git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-parse HEAD | cut -b 1-8).tar.gz |