From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 28 Feb 2008 13:50:34 +0000 (+0000)
Subject: install to sbin
X-Git-Tag: release-0.10~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0da5bc14c3e617110f91001ed67553a68bdc499;p=thirdparty%2Funbound.git

install to sbin


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

diff --git a/Makefile.in b/Makefile.in
index 8725cf2af..c856caf19 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,6 +22,7 @@ srcdir=@srcdir@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
+sbindir=@sbindir@
 mandir=@mandir@
 libdir=@libdir@
 # datarootdir is here to please some checkers, use datadir.
@@ -256,26 +257,31 @@ strip:
 	strip unbound-host
 
 install:
-	$(INSTALL) -m 755 -d $(bindir)
+	$(INSTALL) -m 755 -d $(sbindir)
 	$(INSTALL) -m 755 -d $(mandir)
 	$(INSTALL) -m 755 -d $(mandir)/man8
 	$(INSTALL) -m 755 -d $(mandir)/man5
+	$(INSTALL) -m 755 -d $(mandir)/man3
+	$(INSTALL) -m 755 -d $(mandir)/man1
 	$(INSTALL) -m 755 -d $(libdir)
 	$(INSTALL) -m 755 -d $(includedir)
-	$(LIBTOOL) --mode=install cp unbound $(bindir)/unbound
-	$(LIBTOOL) --mode=install cp unbound-checkconf $(bindir)/unbound-checkconf
-	$(LIBTOOL) --mode=install cp unbound-host $(bindir)/unbound-host
+	$(LIBTOOL) --mode=install cp unbound $(sbindir)/unbound
+	$(LIBTOOL) --mode=install cp unbound-checkconf $(sbindir)/unbound-checkconf
+	$(LIBTOOL) --mode=install cp unbound-host $(sbindir)/unbound-host
 	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound.8 $(mandir)/man8
 	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound-checkconf.8 $(mandir)/man8
 	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound.conf.5 $(mandir)/man5
+	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(mandir)/man1
+	$(INSTALL) -c -m 644 $(srcdir)/doc/libunbound.3 $(mandir)/man3
 	if test ! -e $(configfile); then $(INSTALL) -d `dirname $(configfile)`; $(INSTALL) -c -m 644 $(srcdir)/doc/example.conf $(configfile); fi
 	$(LIBTOOL) --mode=install cp $(srcdir)/libunbound/unbound.h $(includedir)/unbound.h
 	$(LIBTOOL) --mode=install cp libunbound.la $(libdir)
 	$(LIBTOOL) --mode=finish $(libdir)
 
 uninstall:
-	rm -f -- $(bindir)/unbound $(bindir)/unbound-checkconf $(bindir)/unbound-host
+	rm -f -- $(sbindir)/unbound $(sbindir)/unbound-checkconf $(sbindir)/unbound-host
 	rm -f -- $(mandir)/man8/unbound.8 $(mandir)/man8/unbound-checkconf.8 $(mandir)/man5/unbound.conf.5
+	rm -f -- $(mandir)/man1/unbound-host.1 $(mandir)/man3/libunbound.3
 	rm -f -- $(includedir)/unbound.h
 	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/libunbound.la
 	@echo
diff --git a/doc/Changelog b/doc/Changelog
index 2c913de05..5a0ec3e65 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,8 @@
 	- snprintf compat update.
 	- harvest performs lookup.
 	- ldns-tarball update with fix for ldns_dname_label.
+	- installs to sbin by default.
+	- install all manual pages (unbound-host and libunbound too).
 
 27 February 2008: Wouter
 	- option to use caps for id randomness.
diff --git a/testcode/harvest.c b/testcode/harvest.c
index 67f0edfab..60422f42e 100644
--- a/testcode/harvest.c
+++ b/testcode/harvest.c
@@ -483,7 +483,7 @@ harvest_main(struct harvest_data* data)
 	int numdone = 0;
 	/* register todo queries for all original queries */
 	make_todo(data);
-	printf("depth 0: todo %d list %d\n", 0, data->numtodo);
+	printf("depth 0: done %d todo %d\n", 0, data->numtodo);
 	/* pick up a todo item and process it */
 	while(data->todo_list) {
 		numdone++;
@@ -492,10 +492,15 @@ harvest_main(struct harvest_data* data)
 		if(!data->todo_list) data->todo_last = NULL;
 		if(numdone%1000==0 || it->depth > data->curdepth) {
 			data->curdepth = it->depth;
-			printf("depth %d: todo %d list %d, %d rrs\n", 
+			printf("depth %d: done %d todo %d, %d rrs\n", 
 				it->depth, numdone, data->numtodo, 
 				data->num_rrs);
 		}
+		if(it->depth >= data->maxdepth) {
+			printf("obtained %d rrs to a max of %d labels.\n",
+				data->num_rrs, data->maxlabels);
+			return;
+		}
 		data->numtodo--;
 		process(data, it);
 	}
@@ -518,7 +523,7 @@ int main(int argc, char* argv[])
 	data.ctx = ub_ctx_create();
 	data.resultdir = strdup("harvested_zones");
 	if(!data.resultdir) error_exit("out of memory");
-	data.maxdepth = 10;
+	data.maxdepth = 2;
 
 	/* parse the options */
 	while( (c=getopt(argc, argv, "hf:v")) != -1) {