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:54:40 +0100 |
| commit | 65370f9bbcbfc4a5bb87aa5e30f74da48966b7c1 (patch) | |
| tree | e18662be864e0f44456ab9580f1ff0f89910ce87 /Makefile.org | |
| parent | 4ca026560a211ef2143199e4531aae377878e17a (diff) | |
Makefile.org: fix syntax error on Solaris.
PR: 3271
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.org b/Makefile.org index 52a3d15597..e7f6e5beb9 100644 --- a/Makefile.org +++ b/Makefile.org @@ -666,11 +666,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; \ @@ -678,6 +674,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 \ |