summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2008-11-27 06:27:47 -0500
committerThomas Guyot-Sionnest <dermoth@aei.ca>2008-11-27 06:27:47 -0500
commitd40abb2504b99e1318840ad1a5d9f4a340c465b5 (patch)
tree908d8790eb2b3dcec07157605b41b20aa881943f
parent399f0770b2773a5e4864c41efb92a5857e6e45c6 (diff)
downloadmonitoring-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.
-rwxr-xr-xtools/tinderbox_build6
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 {
234 $Path = $ENV{PATH}; 234 $Path = $ENV{PATH};
235 print "Path before: $Path\n"; 235 print "Path before: $Path\n";
236 236
237 if ( $OS eq 'SunOS' ) { 237 # Don't alter path if we're building off a repository tree;
238 $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'}; 238 # SunOS make will work only out of snapshots and releases.
239 if ( $OS eq 'SunOS' && !( -e '.svn' || -e '.git' )) {
240 $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
239 } 241 }
240 242
241 $Path = $ENV{PATH}; 243 $Path = $ENV{PATH};