diff options
| author | Rich Salz <rsalz@openssl.org> | 2014-09-09 13:53:16 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2014-09-09 17:06:14 -0400 |
| commit | 843921f29864aae71d360803d355e8f22cdcf822 (patch) | |
| tree | f79ebedd62752165e64b5d4b850ad94bd28fb53b /engines | |
| parent | 1f18f50c4b0711ebe4a20038d324c0de5dce4512 (diff) | |
RT3271: Don't use "if !" in shell lines
For portability don't use "if ! expr"
Reviewed-by: Geoff Thorpe <geoff@openssl.org>
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/Makefile | 8 | ||||
| -rw-r--r-- | engines/ccgost/Makefile | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/Makefile b/engines/Makefile index 4bad384bfb..d0881f2977 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -120,7 +120,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"`;; \ @@ -129,9 +132,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 ); \ diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile index 97fac82d6b..43e06fbecc 100644 --- a/engines/ccgost/Makefile +++ b/engines/ccgost/Makefile @@ -47,7 +47,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"`;; \ @@ -56,9 +59,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; \ |