From 756384f9fafe982c88f2627afd7f9e6dab5b9b09 Mon Sep 17 00:00:00 2001 From: Victor Nakoryakov Date: Fri, 4 Nov 2011 14:39:39 +0400 Subject: [PATCH] + installation via `make install' --- INSTALL | 14 ++++++++++++++ Makefile | 14 ++++++++++++++ README.rst | 17 +++++++++-------- setup.py | 2 +- 4 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 INSTALL create mode 100644 Makefile diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..df60fb6 --- /dev/null +++ b/INSTALL @@ -0,0 +1,14 @@ +In order to install Ino from source tarball run: + + make install + +By default Ino is installed into `/usr/local'. You can change this by setting +PREFIX or DESTDIR variables. + + * DESTDIR changes file system root (`/' by default) + * PREFIX sets installation prefix (`/usr/local` by default). + +Examples: + + * make install DESTDIR=~/ino + * make install PREFIX=/usr diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2772b7c --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ + +DESTDIR=/ +PREFIX=/usr/local + +all: + @# do nothing yet + +doc: + $(MAKE) -f doc/Makefile html + +install: + python setup.py install --root $(DESTDIR) --prefix $(PREFIX) --exec-prefix $(PREFIX) + +.PHONY : doc diff --git a/README.rst b/README.rst index e84073d..791253d 100644 --- a/README.rst +++ b/README.rst @@ -40,16 +40,17 @@ Features Installation ============ -With python setup tools:: - - $ sudo pip install ino - # ... or ... - $ sudo easy_install ino +From source: -Or clone from GitHub:: +* `Download latest source tarball `_ +* Or clone it from GitHub: ``git clone git://github.com/amperka/ino.git`` +* Do ``make install`` to perform installation under ``/usr/local`` +* Or see ``INSTALL`` for instructions on changing destination directory - $ git clone git://github.com/amperka/ino.git - $ export PATH=`pwd`/ino/bin +With Python setup tools: + +* Either ``pip install ino`` +* Or ``easy_install ino`` Requirements ============ diff --git a/setup.py b/setup.py index 9535b8c..1a56acc 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ ino_package_data = gen_data_files('ino', 'make') + gen_data_files('ino', 'templa setup( name='ino', - version='0.1.10', + version='0.1.11', description='Command line toolkit for working with Arduino hardware', long_description=readme_content, author='Victor Nakoryakov, Amperka Team',