Merge pull request zenoss#477 from zenoss/feature/master_release_issues

Fix inconsistencies after 2.0.7 release.

setup.py

@@ -3,7 +3,7 @@
 # or saved.  Do not modify them directly here.
 # NB: PACKAGES is deprecated
 NAME = "ZenPacks.zenoss.ZenPackLib"
-VERSION = "2.0.7.10"
+VERSION = "2.0.7"
 AUTHOR = "Zenoss"
 LICENSE = ""
 NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.zenoss']
@@ -19,6 +19,14 @@
 from subprocess import Popen, PIPE
 from setuptools import setup, find_packages
 
+# Run "make build" if a GNUmakefile is present.
+if os.path.isfile('GNUmakefile'):
+    print 'GNUmakefile found. Running "make build" ..'
+    p = Popen('make build', stdout=PIPE, stderr=PIPE, shell=True)
+    print p.communicate()[0]
+    if p.returncode != 0:
+        raise Exception('"make build" exited with an error: %s' % p.returncode)
+
 setup(
     # This ZenPack metadata should usually be edited with the Zenoss
     # ZenPack edit page.  Whenever the edit page is submitted it will