diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2008-11-27 06:27:47 -0500 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2008-11-27 06:27:47 -0500 |
commit | d40abb2504b99e1318840ad1a5d9f4a340c465b5 (patch) | |
tree | 908d8790eb2b3dcec07157605b41b20aa881943f /tools/tinderbox_build | |
parent | 399f0770b2773a5e4864c41efb92a5857e6e45c6 (diff) | |
download | monitoring-plugins-d40abb2504b99e1318840ad1a5d9f4a340c465b5.tar.gz |
tinderbox: Don't alter SunOS path if we're building off a repository tree
SunOS make will work only out of snapshots and releases.
Diffstat (limited to 'tools/tinderbox_build')
-rwxr-xr-x | tools/tinderbox_build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/tinderbox_build b/tools/tinderbox_build index ab4234aa..5035b603 100755 --- a/tools/tinderbox_build +++ b/tools/tinderbox_build @@ -234,8 +234,10 @@ sub SetupPath { $Path = $ENV{PATH}; print "Path before: $Path\n"; - if ( $OS eq 'SunOS' ) { - $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'}; + # Don't alter path if we're building off a repository tree; + # SunOS make will work only out of snapshots and releases. + if ( $OS eq 'SunOS' && !( -e '.svn' || -e '.git' )) { + $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'}; } $Path = $ENV{PATH}; |