Merge remote-tracking branch 'origin/master'

setup.py

@@ -28,6 +28,12 @@ try:
 except ImportError:
     py2app = None
 
+# make sure our current working directory is the same directory
+# setup.py is in
+curdir = os.path.split(sys.argv[0])[0]
+if curdir:
+    os.chdir(curdir)
+
 # now, setup the keyword arguments for setup
 # (because we don't know until runtime if py2exe/py2app is available)
 setup_kwargs = {}
@@ -44,7 +50,7 @@ setup_kwargs['options'] = {}
 # README file and 2) it's easier to type in the README file than to put a raw
 # string in below ...
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    return open(fname).read()
 
 setup_kwargs['name'] = 'Minecraft-Overviewer'
 setup_kwargs['version'] = util.findGitVersion()
@@ -268,6 +274,8 @@ class CustomBuildExt(build_ext):
                 e.extra_compile_args.append("-Wno-unused-variable") # quell some annoying warnings
                 e.extra_compile_args.append("-Wno-unused-function") # quell some annoying warnings
                 e.extra_compile_args.append("-Wdeclaration-after-statement")
+                p = platform.linux_distribution()
+                if not (p[0] == 'CentOS' and p[1][0] == '5'):
                     e.extra_compile_args.append("-Werror=declaration-after-statement")