get rid of Makefile.ssl in util/

diff --git a/util/cygwin.sh b/util/cygwin.sh
index 0cc31978709363021c82378d6371a1a38f1b88c2..7f791d47f4bbd97239c2dc2955810af27857e29a 100755 (executable)
--- a/util/cygwin.sh
+++ b/util/cygwin.sh
@@ -21,11 +21,11 @@ function cleanup()
 
 function get_openssl_version()
 {
-  eval `grep '^VERSION=' Makefile.ssl`
+  eval `grep '^VERSION=' Makefile`
   if [ -z "${VERSION}" ]
   then
-    echo "Error: Couldn't retrieve OpenSSL version from Makefile.ssl."
-    echo "       Check value of variable VERSION in Makefile.ssl."
+    echo "Error: Couldn't retrieve OpenSSL version from Makefile."
+    echo "       Check value of variable VERSION in Makefile."
     exit 1
   fi
 }

diff --git a/util/fixNT.sh b/util/fixNT.sh
index ce4f19299ba52e00400a106f9a4500877faa7f8e..ab9e766b869900f46410d9a02727c38fae1e9bf5 100755 (executable)
--- a/util/fixNT.sh
+++ b/util/fixNT.sh
@@ -3,12 +3,12 @@
 # clean up the mess that NT makes of my source tree
 #
 
-if [ -f makefile.ssl -a ! -f Makefile.ssl ]; then
-       /bin/mv makefile.ssl Makefile.ssl
+if [ -f makefile -a ! -f Makefile ]; then
+       /bin/mv makefile Makefile
 fi
 chmod +x Configure util/*
 echo cleaning
 /bin/rm -f `find . -name '*.$$$' -print` 2>/dev/null >/dev/null
 echo 'removing those damn ^M'
 perl -pi -e 's/\015//' `find . -type 'f' -print |grep -v '.obj$' |grep -v '.der$' |grep -v '.gz'`
-make -f Makefile.ssl links
+make -f Makefile links

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 6582823452775fa9f52d232c615833c406d8c490..b519210b45368f7dc1f22e5821c91675d239d7d9 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -675,7 +675,7 @@ if ($platform eq "linux-elf") {
     print <<"EOF";
 # Generate perlasm output files
 %.cpp:
-       (cd \$(\@D)/..; PERL=perl make -f Makefile.ssl asm/\$(\@F))
+       (cd \$(\@D)/..; PERL=perl make -f Makefile asm/\$(\@F))
 EOF
 }
 print "###################################################################\n";

diff --git a/util/pod2mantest b/util/pod2mantest
index 412ca8d6d88b0258edd3e81b06cfb253b874a23d..384e683df4cc7636fbf98251d421e62654cca08f 100755 (executable)
--- a/util/pod2mantest
+++ b/util/pod2mantest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This script is used by test/Makefile.ssl to check whether a sane 'pod2man'
+# This script is used by test/Makefile to check whether a sane 'pod2man'
 # is installed.
 # ('make install' should not try to run 'pod2man' if it does not exist or if
 # it is a broken 'pod2man' version that is known to cause trouble. if we find