Merge branch 'feature-fixmakeversions' into develop

xseg/base.mk

@@ -48,12 +48,16 @@ ifndef CSTD
 export CSTD=-std=gnu99 -pedantic
 endif
 
+ifeq (,$(VERSION))
+export TOPDIR=$(shell dirname $(CURDIR))
+export VERSION=$(shell cat $(TOPDIR)/version)
+endif
 
 bindir=/usr/bin/
 libdir=/usr/lib/
 pythondir=/usr/lib/python2.7/
 moduledir=/lib/modules/`uname -r`/extra/
-srcdir=/usr/src/archipelago-kernel-dkms-VERSION/
+srcdir=/usr/src/archipelago-kernel-dkms-$(VERSION)/
 ganetidir=/usr/share/ganeti/extstorage/vlmc/
 
 INC=-I$(BASE)

xseg/sys/user/python/setup.py

@@ -41,15 +41,21 @@ from distutils.util import convert_path
 from fnmatch import fnmatchcase
 from setuptools import setup, find_packages
 
-HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-DEBIANDIR = os.path.join(HERE, '../../../../debian');
+#HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
+TOPDIR = os.environ['TOPDIR']
+DEBIANDIR = os.path.join(TOPDIR, 'debian');
 DEBIANDIR = os.path.normpath(DEBIANDIR)
 
 
+VERSION = os.environ['VERSION']
 # Package info
-VERSION = @VERSION
-README = open(os.path.join(DEBIANDIR, 'README')).read()
-CHANGES = open(os.path.join(DEBIANDIR, 'changelog')).read()
+if os.path.isdir(DEBIANDIR):
+    README = open(os.path.join(DEBIANDIR, 'README')).read()
+    CHANGES = open(os.path.join(DEBIANDIR, 'changelog')).read()
+else:
+    README = ''
+    CHANGES = ''
+
 SHORT_DESCRIPTION = 'Package short description'
 
 PACKAGES_ROOT = '.'