diff options
| author | djm <> | 2005-04-29 05:39:33 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:39:33 +0000 |
| commit | 68edd00d9258df93b1366c71ac124e0cadf7bc08 (patch) | |
| tree | 3ce4ae2a9747bbc11aed1f95f9bbea92c41f8683 /src/lib/libcrypto/util/selftest.pl | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/util/selftest.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/util/selftest.pl b/src/lib/libcrypto/util/selftest.pl index 276b81183d..e9d5aa8938 100644 --- a/src/lib/libcrypto/util/selftest.pl +++ b/src/lib/libcrypto/util/selftest.pl | |||
| @@ -34,9 +34,9 @@ foreach $_ (split("\n",$c)) { | |||
| 34 | $platform0=$1 if (/Configuring for (.*)$/); | 34 | $platform0=$1 if (/Configuring for (.*)$/); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | system "sh config" if (! -f "Makefile.ssl"); | 37 | system "sh config" if (! -f "Makefile"); |
| 38 | 38 | ||
| 39 | if (open(IN,"<Makefile.ssl")) { | 39 | if (open(IN,"<Makefile")) { |
| 40 | while (<IN>) { | 40 | while (<IN>) { |
| 41 | $version=$1 if (/^VERSION=(.*)$/); | 41 | $version=$1 if (/^VERSION=(.*)$/); |
| 42 | $platform=$1 if (/^PLATFORM=(.*)$/); | 42 | $platform=$1 if (/^PLATFORM=(.*)$/); |