diff options
| author | Lutz Jänicke <jaenicke@openssl.org> | 2008-04-17 10:19:16 +0000 |
|---|---|---|
| committer | Lutz Jänicke <jaenicke@openssl.org> | 2008-04-17 10:19:16 +0000 |
| commit | 4c1a6e004a940a66c1d113ea3656a124e3dca1ea (patch) | |
| tree | 83046c2cd8ef940d621c2be052fa822c31730ee0 /engines | |
| parent | 6e6ada18c626baf0215accb3a377f3b1c0e862c1 (diff) | |
Apply mingw patches as supplied by Roumen Petrov an Alon Bar-Lev
PR: 1552
Submitted by: Roumen Petrov <openssl@roumenpetrov.info>, "Alon Bar-Lev" <alon.barlev@gmail.com>
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/.cvsignore | 1 | ||||
| -rw-r--r-- | engines/Makefile | 21 | ||||
| -rw-r--r-- | engines/ccgost/.cvsignore | 1 | ||||
| -rw-r--r-- | engines/ccgost/Makefile | 18 |
4 files changed, 24 insertions, 17 deletions
diff --git a/engines/.cvsignore b/engines/.cvsignore index 47b5fd114a..b722ca8957 100644 --- a/engines/.cvsignore +++ b/engines/.cvsignore @@ -3,3 +3,4 @@ lib libs *.flc semantic.cache +*.dll diff --git a/engines/Makefile b/engines/Makefile index 7796cb5351..e3719bcdae 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -99,26 +99,29 @@ links: # for shared libraries as well as for Cygwin which uses the # dlfcn_name_converter and therefore stores the engines with .so suffix, too. # XXXXX This was extended to HP-UX dl targets, which use .sl suffix. +# XXXXX This was extended to mingw targets, which use eay32.dll suffix without lib as prefix. install: @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @if [ -n "$(SHARED_LIBS)" ]; then \ set -e; \ for l in $(LIBNAMES); do \ ( echo installing $$l; \ + pfx=lib; \ if [ "$(PLATFORM)" != "Cygwin" ]; then \ case "$(CFLAGS)" in \ - *DSO_BEOS*) sfx="so";; \ - *DSO_DLFCN*) sfx="so";; \ - *DSO_DL*) sfx="sl";; \ - *) sfx="bad";; \ + *DSO_BEOS*) sfx=".so";; \ + *DSO_DLFCN*) sfx=".so";; \ + *DSO_DL*) sfx=".sl";; \ + *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ + *) sfx=".bad";; \ esac; \ - cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ + cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \ else \ - sfx="so"; \ - cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ + sfx=".so"; \ + cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \ fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx ); \ done; \ fi @target=install; $(RECURSIVE_MAKE) diff --git a/engines/ccgost/.cvsignore b/engines/ccgost/.cvsignore index 47b5fd114a..b722ca8957 100644 --- a/engines/ccgost/.cvsignore +++ b/engines/ccgost/.cvsignore @@ -3,3 +3,4 @@ lib libs *.flc semantic.cache +*.dll diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile index 737fad3754..eae172f306 100644 --- a/engines/ccgost/Makefile +++ b/engines/ccgost/Makefile @@ -44,20 +44,22 @@ install: if [ -n "$(SHARED_LIBS)" ]; then \ set -e; \ echo installing $(LIBNAME); \ + pfx=lib; \ if [ "$(PLATFORM)" != "Cygwin" ]; then \ case "$(CFLAGS)" in \ - *DSO_BEOS*) sfx="so";; \ - *DSO_DLFCN*) sfx="so";; \ - *DSO_DL*) sfx="sl";; \ - *) sfx="bad";; \ + *DSO_BEOS*) sfx=".so";; \ + *DSO_DLFCN*) sfx=".so";; \ + *DSO_DL*) sfx=".sl";; \ + *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ + *) sfx=".bad";; \ esac; \ - cp lib$(LIBNAME).$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx.new; \ + cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx.new; \ else \ sfx="so"; \ - cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx.new; \ + cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx.new; \ fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx.new; \ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx; \ fi links: |