documented. Makefile slightly better at dependencies.

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

diff --git a/Makefile.in b/Makefile.in
index 1e3ce0a3253e08b2c818b65ab130b011f03cdb76..2daa7a4875fbffa23d78a41f7f7e009450e090e1 100644 (file)
--- 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 17372cf300f957be244371cb94802c98cededd12..edef5a6e3981828f31b0101e10854d7afc44b548 100644 (file)
--- 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 f790ebc2149d7feb1d587fda8cac6acf0c1116f8..a80fec22ca7efc7da6610402ba66893fd044a52c 100644 (file)
--- 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\r
 (package names for fedora 11).\r
 \r
-Then run:\r
+For dynamic linked executables\r
 $ mingw32-configure\r
 $ make\r
-\r
-Copy System.dll from the windows dist of NSIS to /usr/share/nsis/Plugins/\r
+$ mkdir /home/user/installdir\r
+$ make install DESTDIR=/home/user/installdir\r
+Find the dlls and exes in /home/user/installdir and\r
+crypto in /usr/i686-pc-mingw32/sys-root/mingw/bin\r
+\r
+For static linked executables\r
+Use --enable-staticexe for mingw32-configure, see above. Or use makedist.sh,\r
+copy System.dll from the windows dist of NSIS to /usr/share/nsis/Plugins/\r
 Then do ./makedist.sh -w and the setup.exe is created using nsis.\r
 \r
 \r