get rid of Makefile.ssl in util/
This commit is contained in:
parent
69af4faec1
commit
cd202fe2f9
@ -21,11 +21,11 @@ function cleanup()
|
|||||||
|
|
||||||
function get_openssl_version()
|
function get_openssl_version()
|
||||||
{
|
{
|
||||||
eval `grep '^VERSION=' Makefile.ssl`
|
eval `grep '^VERSION=' Makefile`
|
||||||
if [ -z "${VERSION}" ]
|
if [ -z "${VERSION}" ]
|
||||||
then
|
then
|
||||||
echo "Error: Couldn't retrieve OpenSSL version from Makefile.ssl."
|
echo "Error: Couldn't retrieve OpenSSL version from Makefile."
|
||||||
echo " Check value of variable VERSION in Makefile.ssl."
|
echo " Check value of variable VERSION in Makefile."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -3,12 +3,12 @@
|
|||||||
# clean up the mess that NT makes of my source tree
|
# clean up the mess that NT makes of my source tree
|
||||||
#
|
#
|
||||||
|
|
||||||
if [ -f makefile.ssl -a ! -f Makefile.ssl ]; then
|
if [ -f makefile -a ! -f Makefile ]; then
|
||||||
/bin/mv makefile.ssl Makefile.ssl
|
/bin/mv makefile Makefile
|
||||||
fi
|
fi
|
||||||
chmod +x Configure util/*
|
chmod +x Configure util/*
|
||||||
echo cleaning
|
echo cleaning
|
||||||
/bin/rm -f `find . -name '*.$$$' -print` 2>/dev/null >/dev/null
|
/bin/rm -f `find . -name '*.$$$' -print` 2>/dev/null >/dev/null
|
||||||
echo 'removing those damn ^M'
|
echo 'removing those damn ^M'
|
||||||
perl -pi -e 's/\015//' `find . -type 'f' -print |grep -v '.obj$' |grep -v '.der$' |grep -v '.gz'`
|
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
|
||||||
|
@ -675,7 +675,7 @@ if ($platform eq "linux-elf") {
|
|||||||
print <<"EOF";
|
print <<"EOF";
|
||||||
# Generate perlasm output files
|
# Generate perlasm output files
|
||||||
%.cpp:
|
%.cpp:
|
||||||
(cd \$(\@D)/..; PERL=perl make -f Makefile.ssl asm/\$(\@F))
|
(cd \$(\@D)/..; PERL=perl make -f Makefile asm/\$(\@F))
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
print "###################################################################\n";
|
print "###################################################################\n";
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/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.
|
# is installed.
|
||||||
# ('make install' should not try to run 'pod2man' if it does not exist or if
|
# ('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
|
# it is a broken 'pod2man' version that is known to cause trouble. if we find
|
||||||
|
Loading…
x
Reference in New Issue
Block a user