Fix some issues near recent chomp changes.

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 3a9f0d76b8267f3f82ea0e570ef18943deef8890..f29e50bb776f6b80bbb54f8a33f3a063c255a9d2 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -553,8 +553,10 @@ if ($fips)
                        {
                        open (IN, "util/fipslib_path.txt") || fipslib_error();
                        $fipslibdir = <IN>;
-                       $fipslibdir =~ s|\R$||;
                        close IN;
+                       $fipslibdir = "" unless defined($fipslibdir);
+                       $fipslibdir =~ s{\R$}{};
+                       fipslib_error() if ($fipslibdir eq "");
                        }
                fips_check_files($fipslibdir,
                                "fipscanister.lib", "fipscanister.lib.sha1",