diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-02-28 22:54:40 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-02-28 22:55:44 +0100 |
| commit | cd077dab08769091ebff3c2a5cbb27ffdb8043a7 (patch) | |
| tree | fcf8143392b90f75109c2a77277bec268ebce1fd | |
| parent | d1201e31958d974a61f0c614b79de17657689fc7 (diff) | |
| download | openssl-new-cd077dab08769091ebff3c2a5cbb27ffdb8043a7.tar.gz | |
Makefile.org: fix syntax error on Solaris.
PR: 3271
(cherry picked from commit 65370f9bbcbfc4a5bb87aa5e30f74da48966b7c1)
| -rw-r--r-- | Makefile.org | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.org b/Makefile.org index 138d46ba7d..e4d603661a 100644 --- a/Makefile.org +++ b/Makefile.org @@ -571,11 +571,7 @@ install_sw: do \ if [ -f "$$i" -o -f "$$i.a" ]; then \ ( echo installing $$i; \ - if ! expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ - else \ + if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ @@ -583,6 +579,10 @@ install_sw: cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ + else \ + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ fi ); \ if expr $(PLATFORM) : 'mingw' > /dev/null; then \ ( case $$i in \ |