setup: merge two patches which both change VERSIONFILE name computation to the typica...

Ignore-this: 68b65973cf5953567b95a17c1ef1635d

darcs-hash:1d0ba49a479c745dbb5bb780f30b8bcc41631f51

diff --git a/zfec/setup.py b/zfec/setup.py
index 3c187c94dfbae134ce4d8525a730a906d81e6d83..ef123dcf69e03a7fd642e47d94c19c9d0fb2b13d 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -85,7 +85,7 @@ trove_classifiers=[
     ]
 
 PKG = "zfec"
-VERSIONFILE = PKG+"/_version.py"
+VERSIONFILE = os.path.join(PKG, "_version.py")
 verstr = "unknown"
 try:
     verstrline = open(VERSIONFILE, "rt").read()