The naming scheme wasn't quite correct for Cygwin

diff --git a/Makefile.org b/Makefile.org
index fa18de17eb7f8e66f0c8e964182fc7c1d7dbc5ff..dd3d59a14a9183f8e9de408fdff077828640e307 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -749,7 +749,7 @@ install: all install_docs
                                        chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
                                        mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
                                else \
-                                       c=`echo $$i | sed 's/^lib\(.*\)/cyg\1-$(SHLIB_VERSION_NUMBER)/'`; \
+                                       c=`echo $$i | sed 's/^lib\(.*\)\.dll/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
                                        cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
                                        chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
                                        mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \

diff --git a/util/cygwin.sh b/util/cygwin.sh
index 930f766b4ffef9a531b8d10f93a599adc15272a9..1bb5b95d1e1a9c4e1da4813b573a0035088bcc60 100755 (executable)
--- a/util/cygwin.sh
+++ b/util/cygwin.sh
@@ -114,13 +114,13 @@ strip usr/bin/*.exe usr/bin/*.dll
 # Runtime package
 find etc usr/bin usr/doc usr/ssl/certs usr/ssl/man/man[157] usr/ssl/misc \
      usr/ssl/openssl.cnf usr/ssl/private -empty -o \! -type d |
-tar cjfT openssl-${VERSION}-${SUBVERSION}.tar.bz2 -
+tar cjfT openssl2-${VERSION}-${SUBVERSION}.tar.bz2 -
 # Development package
 find usr/include usr/lib usr/ssl/man/man3 -empty -o \! -type d |
-tar cjfT openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2 -
+tar cjfT openssl2-devel-${VERSION}-${SUBVERSION}.tar.bz2 -
 
-ls -l openssl-${VERSION}-${SUBVERSION}.tar.bz2
-ls -l openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2
+ls -l openssl2-${VERSION}-${SUBVERSION}.tar.bz2
+ls -l openssl2-devel-${VERSION}-${SUBVERSION}.tar.bz2
 
 cleanup