- if configured --with-libunbound-only fix make install.

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

diff --git a/Makefile.in b/Makefile.in
index 9f4b78738d5652aef5cd2cd2d519c9edd253faa6..0a47bc5a127b9dee80ec2cbd3f3c29e70c76b1e9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ UNBOUND_VERSION_MAJOR=@UNBOUND_VERSION_MAJOR@
 UNBOUND_VERSION_MINOR=@UNBOUND_VERSION_MINOR@
 UNBOUND_VERSION_MICRO=@UNBOUND_VERSION_MICRO@
 ALLTARGET=@ALLTARGET@
+INSTALLTARGET=@INSTALLTARGET@
 
 # _unbound.la if pyunbound enabled.
 PYUNBOUND_TARGET=@PYUNBOUND_TARGET@
@@ -455,15 +456,34 @@ unbound-event-install:
        $(INSTALL) -m 755 -d $(DESTDIR)$(includedir)
        $(LIBTOOL) --mode=install cp $(srcdir)/libunbound/unbound-event.h $(DESTDIR)$(includedir)/unbound-event.h
 
-install:       all $(PYTHONMOD_INSTALL) $(PYUNBOUND_INSTALL) $(UNBOUND_EVENT_INSTALL)
+install:       $(INSTALLTARGET)
+
+install-lib:   lib $(UNBOUND_EVENT_INSTALL)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(includedir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man3
+       $(INSTALL) -c -m 644 doc/libunbound.3 $(DESTDIR)$(mandir)/man3
+       for mpage in ub_ctx ub_result ub_ctx_create ub_ctx_delete \
+               ub_ctx_set_option ub_ctx_get_option ub_ctx_config ub_ctx_set_fwd \
+               ub_ctx_resolvconf ub_ctx_hosts ub_ctx_add_ta ub_ctx_add_ta_file \
+               ub_ctx_trustedkeys ub_ctx_debugout ub_ctx_debuglevel ub_ctx_async \
+               ub_poll ub_wait ub_fd ub_process ub_resolve ub_resolve_async ub_cancel \
+               ub_resolve_free ub_strerror ub_ctx_print_local_zones ub_ctx_zone_add \
+               ub_ctx_zone_remove ub_ctx_data_add ub_ctx_data_remove; \
+       do \
+               echo ".so man3/libunbound.3" > $(DESTDIR)$(mandir)/man3/$$mpage.3 ; \
+       done
+       $(LIBTOOL) --mode=install cp unbound.h $(DESTDIR)$(includedir)/unbound.h
+       $(LIBTOOL) --mode=install cp libunbound.la $(DESTDIR)$(libdir)
+       $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
+
+install-all:   all $(PYTHONMOD_INSTALL) $(PYUNBOUND_INSTALL) $(UNBOUND_EVENT_INSTALL) install-lib
        $(INSTALL) -m 755 -d $(DESTDIR)$(sbindir)
        $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
        $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
        $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man5
-       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man3
        $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
-       $(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
-       $(INSTALL) -m 755 -d $(DESTDIR)$(includedir)
        $(LIBTOOL) --mode=install cp unbound$(EXEEXT) $(DESTDIR)$(sbindir)/unbound$(EXEEXT)
        $(LIBTOOL) --mode=install cp unbound-checkconf$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-checkconf$(EXEEXT)
        $(LIBTOOL) --mode=install cp unbound-control$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-control$(EXEEXT)
@@ -476,22 +496,8 @@ install:   all $(PYTHONMOD_INSTALL) $(PYUNBOUND_INSTALL) $(UNBOUND_EVENT_INSTALL)
        $(INSTALL) -c -m 644 doc/unbound-anchor.8 $(DESTDIR)$(mandir)/man8
        $(INSTALL) -c -m 644 doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5
        $(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(DESTDIR)$(mandir)/man1
-       $(INSTALL) -c -m 644 doc/libunbound.3 $(DESTDIR)$(mandir)/man3
-       for mpage in ub_ctx ub_result ub_ctx_create ub_ctx_delete \
-               ub_ctx_set_option ub_ctx_get_option ub_ctx_config ub_ctx_set_fwd \
-               ub_ctx_resolvconf ub_ctx_hosts ub_ctx_add_ta ub_ctx_add_ta_file \
-               ub_ctx_trustedkeys ub_ctx_debugout ub_ctx_debuglevel ub_ctx_async \
-               ub_poll ub_wait ub_fd ub_process ub_resolve ub_resolve_async ub_cancel \
-               ub_resolve_free ub_strerror ub_ctx_print_local_zones ub_ctx_zone_add \
-               ub_ctx_zone_remove ub_ctx_data_add ub_ctx_data_remove; \
-       do \
-               echo ".so man3/libunbound.3" > $(DESTDIR)$(mandir)/man3/$$mpage.3 ; \
-       done
        $(INSTALL) -c -m 755 unbound-control-setup $(DESTDIR)$(sbindir)/unbound-control-setup
        if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile); fi
-       $(LIBTOOL) --mode=install cp unbound.h $(DESTDIR)$(includedir)/unbound.h
-       $(LIBTOOL) --mode=install cp libunbound.la $(DESTDIR)$(libdir)
-       $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
 pythonmod-uninstall:
        rm -f -- $(DESTDIR)$(PYTHON_SITE_PKG)/unboundmodule.py

diff --git a/configure.ac b/configure.ac
index 017cd2aceedd8db95ff40ee0b781dbe14c91fcec..bc47dbf5e906877103be8083f02cb8f7e67c7c70 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1031,14 +1031,17 @@ AC_SUBST(SOURCEFILE)
 
 # see if we want to build the library or everything
 ALLTARGET="alltargets"
+INSTALLTARGET="install-all"
 AC_ARG_WITH(libunbound-only, AC_HELP_STRING([--with-libunbound-only],
        [do not build daemon and tool programs]),
        [
        if test "$withval" = "yes"; then
                ALLTARGET="lib"
+               INSTALLTARGET="install-lib"
        fi
 ])
 AC_SUBST(ALLTARGET)
+AC_SUBST(INSTALLTARGET)
 
 ACX_STRIP_EXT_FLAGS
 LDFLAGS="$LATE_LDFLAGS $LDFLAGS"

diff --git a/doc/Changelog b/doc/Changelog
index 2eac9ebd33430b6e9262549709e26f6684be973c..951c7aa54008bc40f6feb4548666abdd1bd2ccdd 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+3 Nov 2013: Wouter
+       - if configured --with-libunbound-only fix make install.
+
 31 Oct 2013: Wouter
        - Fix #531: Set SO_REUSEADDR so that the wildcard interface and a 
          more specific interface port 53 can be used at the same time, and