diff options
author | Roger Leigh <rleigh@debian.org> | 2008-11-17 23:45:56 +0000 |
---|---|---|
committer | Roger Leigh <rleigh@debian.org> | 2008-11-17 23:45:56 +0000 |
commit | 15fd5cc391273464beef576568675599633a9827 (patch) | |
tree | e7d832b47e388c2691310404e2f9e2961d89705a /src/testpattern/run-testpattern-2.in | |
parent | 33a17feb28af2d2aeabc8c7ab5ef509ea3de15a7 (diff) |
Imported Upstream version 5.2.2
Diffstat (limited to 'src/testpattern/run-testpattern-2.in')
-rw-r--r-- | src/testpattern/run-testpattern-2.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in index b35bf90..3e5b7d9 100644 --- a/src/testpattern/run-testpattern-2.in +++ b/src/testpattern/run-testpattern-2.in @@ -80,12 +80,23 @@ foreach my $opt (@default_options) { my $pwd = `pwd`; chomp $pwd; +my $srcdir = $ENV{"srcdir"}; +my $sdir; + +if ("$srcdir" eq "" || "$srcdir" eq ".") { + $sdir = $pwd; +} elsif ($srcdir =~ /^\//) { + $sdir = "$srcdir"; +} else { + $sdir = "$pwd/$srcdir"; +} + if (! $run_installed && ! defined $ENV{"STP_DATA_PATH"}) { - $ENV{"STP_DATA_PATH"} = "${pwd}/../xml"; + $ENV{"STP_DATA_PATH"} = "${sdir}/../xml"; } if (! defined $ENV{"STP_MODULE_PATH"}) { - $ENV{"STP_MODULE_PATH"} = "${pwd}/../main:${pwd}/../main/.libs"; + $ENV{"STP_MODULE_PATH"} = "${sdir}/../main:${sdir}/../main/.libs"; } sub set_opt($$$) { |