4 files changed, 7 insertions, 26 deletions
diff --git a/commands/account/Makefile b/commands/account/Makefile
index 8c02686..ee4552b 100644
--- a/commands/account/Makefile
+++ b/commands/account/Makefile
@@ -1,19 +1 @@
-PYTHONPATH?=$(HOME)/workspace/python_sandbox
-DEVELOPDIR?=$(shell echo $(PYTHONPATH) | cut -d : -f 1)
-
-.PHONY: sdist develop upload_docs clean all
-
-all: sdist
-
-sdist:
-	python setup.py sdist
-
-develop:
-	python setup.py develop --install-dir=$(DEVELOPDIR)
-
-upload_docs:
-	make -C doc html
-	python setup.py upload_docs
-
-clean:
-	make -C doc clean
+include ../../Makefile.inc
diff --git a/commands/account/doc/conf.py b/commands/account/doc/conf.py.skel
index 1f6e78f..9aee71a 100644
--- a/commands/account/doc/conf.py
+++ b/commands/account/doc/conf.py.skel
@@ -48,9 +48,9 @@ copyright = u'2014, Red Hat, Inc.'
 # built documents.
 #
 # The short X.Y version.
-version = '0.0.1'
+version = "@@VERSION@@"
 # The full version, including alpha/beta/rc tags.
-release = '0.0.1'
+release = "@@VERSION@@"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/commands/account/setup.cfg b/commands/account/setup.cfg
new file mode 100644
index 0000000..2ddce25
--- /dev/null
+++ b/commands/account/setup.cfg
@@ -0,0 +1,2 @@
+[upload_docs]
+upload-dir = doc/_build/html
diff --git a/commands/account/setup.py b/commands/account/setup.py.skel
index 8d81d71..86df908 100644
--- a/commands/account/setup.py
+++ b/commands/account/setup.py.skel
@@ -1,8 +1,5 @@
 #!/usr/bin/env python
 
-PROJECT = 'openlmi-scripts-account'
-VERSION = '0.0.1'
-
 from setuptools import setup, find_packages
 
 try:
@@ -11,8 +8,8 @@ except IOError:
     long_description = ''
 
 setup(
-    name=PROJECT,
-    version=VERSION,
+    name='openlmi-scripts-account',
+    version='@@VERSION@@',
     description='LMI command for system account administration.',
     long_description=long_description,
     author='Roman Rakus',