From: Willem Toorop <willem@NLnetLabs.nl>
Date: Wed, 17 Oct 2012 13:36:24 +0000 (+0000)
Subject: Allow for builddir != srcdir for the new (generated) manpages drill.1, ldns-dane... 
X-Git-Tag: release-1.6.17rc1~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e73a9018f0b6a2f0819701ef0aca403bd4b5f228;p=thirdparty%2Fldns.git

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

diff --git a/Makefile.in b/Makefile.in
index 40b14879..e1edf843 100644
--- 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 9b7f45b2..ac555fa1 100644
--- 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 4d867ca6..876a4e5e 100644
--- 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 f5c86b4e..371bfa4c 100644
--- 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);