Allow for builddir != srcdir for the new (generated) manpages drill.1, ldns-dane...

diff --git a/Makefile.in b/Makefile.in
index 40b1487966ba72d288611fc15d4831fbc59b64c4..e1edf843807b0a598c8df0317e2b43958091561c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -186,7 +186,10 @@ install-examples: $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_P
        $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
        for p in $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) ; do \
                $(LIBTOOL) --mode=install cp $$p $(DESTDIR)$(bindir) ; \
-               $(INSTALL) -m 644 $(srcdir)/$$p.1 $(DESTDIR)$(mandir)/man1 ; \
+               if test -f $$p.1 ; \
+               then $(INSTALL) -m 644 $$p.1 $(DESTDIR)$(mandir)/man1 ; \
+               else $(INSTALL) -m 644 $(srcdir)/$$p.1 $(DESTDIR)$(mandir)/man1 ; \
+               fi ; \
        done
 
 uninstall-examples:

diff --git a/drill/Makefile.in b/drill/Makefile.in
index 9b7f45b28aae993397255d961845a4b318a3c992..ac555fa1e5752ec59549635e91691ff6e78cdc42 100644 (file)
--- a/drill/Makefile.in
+++ b/drill/Makefile.in
@@ -99,7 +99,7 @@ doc:
 install: all
        $(INSTALL) -d $(DESTDIR)$(bindir)
        $(INSTALL) drill $(DESTDIR)$(bindir)/drill
-       $(INSTALL) -m 644 $(srcdir)/drill.1 $(DESTDIR)$(mandir)/man1/drill.1
+       $(INSTALL) -m 644 drill.1 $(DESTDIR)$(mandir)/man1/drill.1
 
 uninstall:
        @echo

diff --git a/examples/Makefile.in b/examples/Makefile.in
index 4d867ca6150d7975993bca53ebe417f8244121fc..876a4e5ecf7512b15cdfa3739cca557ff4b4595f 100644 (file)
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -170,7 +170,10 @@ install:   $(PROGRAMS) $(SSL_PROGRAMS)
                $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
                for i in $(PROGRAMS) $(SSL_PROGRAMS); do \
                        $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i $(DESTDIR)$(bindir) ; \
-                       $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+                       if test -f $$i.1 ; \
+                       then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+                       else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+                       fi ; \
                        done
                exit 0
 
@@ -180,11 +183,17 @@ install-static:   all-static
                $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
                for i in $(PROGRAMS); do \
                        $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc $(DESTDIR)$(bindir) ; \
-                       $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+                       if test -f $$i.1 ; \
+                       then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+                       else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+                       fi ; \
                        done
                for i in $(SSL_PROGRAMS); do \
                        $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \
-                       $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+                       if test -f $$i.1 ; \
+                       then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+                       else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+                       fi ; \
                        done
                exit 0
 

diff --git a/examples/ldns-dane.c b/examples/ldns-dane.c
index f5c86b4e3ebcffb38d6094d19b8930ccf03a798d..371bfa4ccdf9a352ff5683bca220ca681e419fdd 100644 (file)
--- a/examples/ldns-dane.c
+++ b/examples/ldns-dane.c
@@ -106,7 +106,7 @@ print_usage(const char* progname)
        printf("\t-t <tlsafile>\tdo not use DNS, "
               "but read TLSA record(s) from <tlsafile>\n"
              );
-       printf("\t-u\t\tuse UDP in stead of TCP to TLS connect\n");
+       printf("\t-u\t\tuse UDP transport instead of TCP\n");
        printf("\t-v\t\tshow version and exit\n");
        /* printf("\t-V [0-5]\tset verbosity level (defaul 3)\n"); */
        exit(EXIT_SUCCESS);