install to sbin

git-svn-id: file:///svn/unbound/trunk@1001 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2008-02-28 13:50:34 +00:00
parent 28dfc5fc39
commit d0da5bc14c
3 changed files with 21 additions and 8 deletions

View file

@ -22,6 +22,7 @@ srcdir=@srcdir@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@ bindir=@bindir@
sbindir=@sbindir@
mandir=@mandir@ mandir=@mandir@
libdir=@libdir@ libdir=@libdir@
# datarootdir is here to please some checkers, use datadir. # datarootdir is here to please some checkers, use datadir.
@ -256,26 +257,31 @@ strip:
strip unbound-host strip unbound-host
install: install:
$(INSTALL) -m 755 -d $(bindir) $(INSTALL) -m 755 -d $(sbindir)
$(INSTALL) -m 755 -d $(mandir) $(INSTALL) -m 755 -d $(mandir)
$(INSTALL) -m 755 -d $(mandir)/man8 $(INSTALL) -m 755 -d $(mandir)/man8
$(INSTALL) -m 755 -d $(mandir)/man5 $(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 $(libdir)
$(INSTALL) -m 755 -d $(includedir) $(INSTALL) -m 755 -d $(includedir)
$(LIBTOOL) --mode=install cp unbound $(bindir)/unbound $(LIBTOOL) --mode=install cp unbound $(sbindir)/unbound
$(LIBTOOL) --mode=install cp unbound-checkconf $(bindir)/unbound-checkconf $(LIBTOOL) --mode=install cp unbound-checkconf $(sbindir)/unbound-checkconf
$(LIBTOOL) --mode=install cp unbound-host $(bindir)/unbound-host $(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.8 $(mandir)/man8
$(INSTALL) -c -m 644 $(srcdir)/doc/unbound-checkconf.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.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 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 $(srcdir)/libunbound/unbound.h $(includedir)/unbound.h
$(LIBTOOL) --mode=install cp libunbound.la $(libdir) $(LIBTOOL) --mode=install cp libunbound.la $(libdir)
$(LIBTOOL) --mode=finish $(libdir) $(LIBTOOL) --mode=finish $(libdir)
uninstall: 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)/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 rm -f -- $(includedir)/unbound.h
$(LIBTOOL) --mode=uninstall rm -f $(libdir)/libunbound.la $(LIBTOOL) --mode=uninstall rm -f $(libdir)/libunbound.la
@echo @echo

View file

@ -4,6 +4,8 @@
- snprintf compat update. - snprintf compat update.
- harvest performs lookup. - harvest performs lookup.
- ldns-tarball update with fix for ldns_dname_label. - 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 27 February 2008: Wouter
- option to use caps for id randomness. - option to use caps for id randomness.

View file

@ -483,7 +483,7 @@ harvest_main(struct harvest_data* data)
int numdone = 0; int numdone = 0;
/* register todo queries for all original queries */ /* register todo queries for all original queries */
make_todo(data); 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 */ /* pick up a todo item and process it */
while(data->todo_list) { while(data->todo_list) {
numdone++; numdone++;
@ -492,10 +492,15 @@ harvest_main(struct harvest_data* data)
if(!data->todo_list) data->todo_last = NULL; if(!data->todo_list) data->todo_last = NULL;
if(numdone%1000==0 || it->depth > data->curdepth) { if(numdone%1000==0 || it->depth > data->curdepth) {
data->curdepth = it->depth; 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, it->depth, numdone, data->numtodo,
data->num_rrs); 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--; data->numtodo--;
process(data, it); process(data, it);
} }
@ -518,7 +523,7 @@ int main(int argc, char* argv[])
data.ctx = ub_ctx_create(); data.ctx = ub_ctx_create();
data.resultdir = strdup("harvested_zones"); data.resultdir = strdup("harvested_zones");
if(!data.resultdir) error_exit("out of memory"); if(!data.resultdir) error_exit("out of memory");
data.maxdepth = 10; data.maxdepth = 2;
/* parse the options */ /* parse the options */
while( (c=getopt(argc, argv, "hf:v")) != -1) { while( (c=getopt(argc, argv, "hf:v")) != -1) {