From 91e49260a76c1be4fdd71f4cd0704a96a9f33f23 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Wed, 15 Jul 2009 13:08:52 +0000 Subject: [PATCH] documented. Makefile slightly better at dependencies. git-svn-id: file:///svn/unbound/trunk@1724 be551aaa-1e26-0410-a405-d3ace91eadb9 --- Makefile.in | 6 ++---- doc/README | 3 +++ winrc/README.txt | 10 ++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1e3ce0a32..2daa7a487 100644 --- a/Makefile.in +++ b/Makefile.in @@ -194,10 +194,8 @@ libunbound.la: $(LIBUNBOUND_OBJ) ifeq ($(patsubst ldns-src%,ldns-src,$(ldnsdir)),ldns-src) ldnslib=$(ldnsdir)/lib/libldns.a -$(ldnslib): - @if test ! -z "$(ldnsdir)"; \ - then (cd $(ldnsdir) && $(MAKE)); fi -$(ldnsdir)/%: +$(ldnslib): $(ldnsdir)/lib +$(ldnsdir)/lib: @if test ! -z "$(ldnsdir)"; \ then (cd $(ldnsdir) && $(MAKE)); fi else diff --git a/doc/README b/doc/README index 17372cf30..edef5a6e3 100644 --- a/doc/README +++ b/doc/README @@ -95,6 +95,9 @@ o If unbound-control (or munin graphs) do not work, this can often be because the unbound-control-setup script creates the keys with restricted permissions, and the files need to be made readable or ownered by both the unbound daemon and unbound-control. +o Crosscompile seems to hang. You tried to install unbound under wine. + wine regedit and remove all the unbound entries from the registry or + delete .wine/drive_c. Acknowledgements ---------------- diff --git a/winrc/README.txt b/winrc/README.txt index f790ebc21..a80fec22c 100644 --- a/winrc/README.txt +++ b/winrc/README.txt @@ -87,11 +87,17 @@ mingw32-gcc mingw32-openssl mingw32-openssl-static mingw32-runtime zip mingw32-termcap mingw32-w32api mingw32-zlib mingw32-zlib-static mingw32-nsis (package names for fedora 11). -Then run: +For dynamic linked executables $ mingw32-configure $ make +$ mkdir /home/user/installdir +$ make install DESTDIR=/home/user/installdir +Find the dlls and exes in /home/user/installdir and +crypto in /usr/i686-pc-mingw32/sys-root/mingw/bin -Copy System.dll from the windows dist of NSIS to /usr/share/nsis/Plugins/ +For static linked executables +Use --enable-staticexe for mingw32-configure, see above. Or use makedist.sh, +copy System.dll from the windows dist of NSIS to /usr/share/nsis/Plugins/ Then do ./makedist.sh -w and the setup.exe is created using nsis.