Commit e61c648f authored by Rich Salz's avatar Rich Salz
Browse files

RT3271: Don't use "if !" in shell lines 



For portability don't use "if ! expr"

Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
(cherry picked from commit b999f66e)
parent 8c0d19d8

engines/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -111,7 +111,10 @@ install: 
		for l in $(LIBNAMES); do \

			( echo installing $$l; \

			  pfx=lib; \

			  if ! expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

			  if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

				sfx=".so"; \

				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \

			  else \

				case "$(CFLAGS)" in \

				*DSO_BEOS*)	sfx=".so";;	\

				*DSO_DLFCN*)	sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;;	\
@@ -120,9 +123,6 @@ install: 
				*)		sfx=".bad";;	\

				esac; \

				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \

			  else \

				sfx=".so"; \

				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \

			  fi; \

			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \

			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \

engines/ccgost/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,10 @@ install: 
		set -e; \

		echo installing $(LIBNAME); \

		pfx=lib; \

		if ! expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

		if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

			sfx=".so"; \

			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \

		else; \

			case "$(CFLAGS)" in \

			*DSO_BEOS*) sfx=".so";; \

			*DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \
@@ -54,9 +57,6 @@ install: 
			*) sfx=".bad";; \

			esac; \

			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \

		else \

			sfx=".so"; \

			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \

		fi; \

		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \

		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \