From: Nathan Binkert <binkertn@umich.edu>
Date: Thu, 31 May 2007 20:45:03 +0000 (-0700)
Subject: obey the m5 style
X-Git-Tag: m5_2.0_beta4~393^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b6de8aaae86ea8b0f416a175c547fc67bea804a;p=gem5.git

obey the m5 style

--HG--
extra : convert_revision : ac0d55c651a2bb6823cbf5a31c6f57ec163730ab
---

diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript
index d6f1e351b..7affa6dcb 100644
--- a/ext/libelf/SConscript
+++ b/ext/libelf/SConscript
@@ -94,13 +94,15 @@ if env.get('CXX'):
     m4env['CXX'] = env['CXX']
 
 # If we have gm4 use it
-if subprocess.Popen("gm4 --version", shell=True, stdout=subprocess.PIPE, 
-                     stderr=subprocess.STDOUT, close_fds=True).communicate()[0].find('GNU') >= 0:
+subp = subprocess.Popen("gm4 --version", shell=True, stdout=subprocess.PIPE, 
+                        stderr=subprocess.STDOUT, close_fds=True)
+if subp.communicate()[0].find('GNU') >= 0:
     m4env['M4'] = 'gm4'
 
 # Check that m4 is available
 if not m4env.get('M4'):
-   print "Error: Can't find version of M4 macro processor. Please install M4 and try again."
+   print "Error: Can't find version of M4 macro processor.  " + \
+         "Please install M4 and try again."
    Exit(1)
 
 m4env.Append(M4FLAGS='-DSRCDIR=%s' % Dir('.').path)