- makedist fix for windows binaries, with openssl 1.1.0 windres fix,

  and expat 2.2.4 install target fix.

git-svn-id: file:///svn/unbound/trunk@4336 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 1deca2f3bbb197adc2f744ebd04b63a09295817b..7b1c47acfacd9e63632f6663c5342689eca5d3af 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 4 September 2017: Wouter
        - tag 1.6.6rc1
+       - makedist fix for windows binaries, with openssl 1.1.0 windres fix,
+         and expat 2.2.4 install target fix.
 
 1 September 2017: Wouter
        - Recommend 1472 buffer size in unbound.conf

diff --git a/makedist.sh b/makedist.sh
index 53c5cec74e45d3fb5f83afd0660748da981fbba5..d386693343dda8dea6643e05a5169613f4e033a6 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -259,7 +259,7 @@ if [ "$DOWIN" = "yes" ]; then
                        sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw"
                fi
                info "winssl: Configure $sslflags"
-               CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed"
+               CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed"
                info "winssl: make"
                make || error_cleanup "OpenSSL crosscompile failed"
                # only install sw not docs, which take a long time.
@@ -279,8 +279,8 @@ if [ "$DOWIN" = "yes" ]; then
                $configure --prefix="$wxpinstall" --exec-prefix="$wxpinstall" --bindir="$wxpinstall/bin" --includedir="$wxpinstall/include" --mandir="$wxpinstall/man" --libdir="$wxpinstall/lib"  || error_cleanup "libexpat configure failed"
                #info "wxp: make"
                #make || error_cleanup "libexpat crosscompile failed"
-               info "wxp: make installlib"
-               make installlib || error_cleanup "libexpat install failed"
+               info "wxp: make install"
+               make install || error_cleanup "libexpat install failed"
                cross_flag="$cross_flag --with-libexpat=$wxpinstall"
                cd ..
        fi