build: fixed 'make dist' without configuring
authorAndrew Tridgell <tridge@samba.org>
Wed, 23 Feb 2011 06:10:10 +0000 (17:10 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 23 Feb 2011 06:55:28 +0000 (07:55 +0100)
this finds git inside samba_version.py

thanks to Simo for noticing this problem

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Feb 23 07:55:28 CET 2011 on sn-devel-104

buildtools/wafsamba/samba_version.py

index 4fe280ee3a10f8c06913331d2b40b4320997cec3..0b0c159f55ff5ec8b361caf3c98df9ed6eb32b95 100644 (file)
@@ -52,6 +52,10 @@ def bzr_version_summary(path):
 
 def git_version_summary(path, env=None):
     # Get version from GIT
+    if not 'GIT' in env and os.path.exists("/usr/bin/git"):
+        # this is useful when doing make dist without configuring
+        env.GIT = "/usr/bin/git"
+
     if not 'GIT' in env:
         return ("GIT-UNKNOWN", {})
 
@@ -74,7 +78,7 @@ def git_version_summary(path, env=None):
     ret = "GIT-" + fields["GIT_COMMIT_ABBREV"]
 
     if env.GIT_LOCAL_CHANGES:
-        clean = Utils.cmd_output('git diff HEAD | wc -l', silent=True).strip()
+        clean = Utils.cmd_output('%s diff HEAD | wc -l' % env.GIT, silent=True).strip()
         if clean == "0":
             fields["COMMIT_IS_CLEAN"] = 1
         else: