Commit f99f91f1 authored by Richard Levitte's avatar Richard Levitte
Browse files

Misc small fixes. 



Better libclean that removes the exact files that have been built,
nothing more and nothing less.

Corrected typo

A couple of editorial changes.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 98e5534e

Configurations/unix-Makefile.tmpl

+14 −4
Original line number Diff line number Diff line
@@ -219,7 +219,17 @@ list-tests: 
	@TOP=$(SRCDIR) PERL=$(PERL) $(PERL) $(SRCDIR)/test/run_tests.pl list



libclean:

	-rm -f `find $(BLDDIR) -name '*$(LIB_EXT)' -o -name '*$(SHLIB_EXT)'`

	@set -e; for s in $(SHLIB_INFO); do \

		s1=`echo "$$s" | cut -f1 -d";"`; \

		s2=`echo "$$s" | cut -f2 -d";"`; \

		echo $(RM) $$s1; \

		$(RM) $$s1; \

		if [ "$$s1" != "$$s2" ]; then \

			echo $(RM) $$s2; \

			$(RM) $$s2; \

		fi; \

	done

	$(RM) $(LIBS)



install: install_sw install_ssldirs install_docs
@@ -252,7 +262,7 @@ Makefile: FORCE 


install_sw: all install_dev install_engines install_runtime



uninstall_sw: uninstall_dev uninstall_engines uninstall_runtime

uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev



install_docs: install_man_docs install_html_docs
@@ -401,7 +411,7 @@ install_runtime: 
	@echo "*** Installing runtime files"

	: {- output_off() unless windowsdll(); "" -};

	@set -e; for s in $(SHLIBS); do \

		fn=`basename $$i`; \

		fn=`basename $$s`; \

		echo "install $$s -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \

		cp $$s $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \

		chmod 644 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
@@ -460,7 +470,7 @@ uninstall_runtime: 
	done

	: {- output_off() unless windowsdll(); "" -};

	@set -e; for s in $(SHLIBS); do \

		fn=`basename $$i`; \

		fn=`basename $$s`; \

		echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \

		$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \

	done

Configure

+2 −1
Original line number Diff line number Diff line
@@ -810,7 +810,8 @@ my %target = ( %{$table{$base_target}}, resolve_config($target) ); 
&usage if (!%target || $target{template});



$target{exe_extension}="";

$target{exe_extension}=".exe" if ($config{target} eq "Cygwin" || $config{target} eq "DJGPP" || $config{target} =~ /^mingw/);

$target{exe_extension}=".exe" if ($config{target} eq "DJGPP"

                                  || $config{target} =~ /^(?:Cygwin|mingw)/);

$target{exe_extension}=".nlm" if ($config{target} =~ /netware/);

$target{exe_extension}=".pm"  if ($config{target} =~ /vos/);

Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ ENGINESDIR={- use File::Spec::Functions; 


CROSS_COMPILE= {- $config{cross_compile_prefix} -}

CC= $(CROSS_COMPILE){- $target{cc} -}

CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -}

CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}},"OPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","ENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"")) -} {- $config{cflags} -}

CFLAG_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -}

LDFLAG= {- $config{lflags} -}

PLIB_LDFLAG= {- $config{plib_lflags} -}