From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 26 Jan 2017 10:19:28 +0000 (+0100)
Subject: Copy manpages from dist tarball
X-Git-Tag: release-1.7.1-rc1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c16b1bd7627355c98312be5b81d171ef038ecfeb;p=thirdparty%2Fldns.git

Copy manpages from dist tarball

instead of generating with a perl script
---

diff --git a/Makefile.in b/Makefile.in
index 5c3bd009..1c4e54e9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -243,7 +243,7 @@ libldns.la-export-all: $(LDNS_ALL_LOBJS)
 mancheck:
 	sh -c 'find . -name \*.\[13\] -exec troff -z {} \;' 2>&1 | sed "s/^\.\///" | sed "s/\(:[0\-9]\+:\)/\1 warning:/g"
 
-doxygen: manpages
+doxygen:
 	@if test ! -e doc/header.html ; then \
 		$(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \
 	fi ;
@@ -253,11 +253,20 @@ doc: manpages $(doxygen)
 	@$(INSTALL) -d doc
 
 manpages: $(srcdir)/doc/function_manpages 
-	@$(INSTALL) -d doc
-	@cat $(srcdir)/ldns/*.h \
-	| $(srcdir)/doc/doxyparse.pl \
-		-m $(srcdir)/doc/function_manpages \
-	| grep -v ^doxygen | grep -v ^cat  > doc/ldns_manpages
+	@$(INSTALL) -d doc/man/man3
+	@if [ -f $(srcdir)/doc/man/man3/ldns_rr.3 ] ; \
+	then \
+		echo "Copying manpages..."; \
+		for m in "$(srcdir)/doc/man/man3/*.3" ; \
+		do \
+			$(INSTALL) -d "$${m}" doc/man/man3; \
+		done; \
+	else \
+		echo "Generating manpages..."; \
+		cat $(srcdir)/ldns/*.h \
+			| $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages \
+			| grep -v ^doxygen | grep -v ^cat  > doc/ldns_manpages; \
+	fi
 
 manpage-create-errors: $(srcdir)/doc/function_manpages 
 	@$(INSTALL) -d doc
diff --git a/configure.ac b/configure.ac
index b7c6c811..c7b64ca2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ sinclude(acx_nlnetlabs.m4)
 # must be numbers. ac_defun because of later processing.
 m4_define([VERSION_MAJOR],[1])
 m4_define([VERSION_MINOR],[7])
-m4_define([VERSION_MICRO],[0])
+m4_define([VERSION_MICRO],[1])
 AC_INIT(ldns, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), libdns@nlnetlabs.nl, libdns)
 AC_CONFIG_SRCDIR([packet.c])
 # needed to build correct soname
@@ -26,9 +26,10 @@ AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO])
 #   set age to 0
 #
 # ldns-1.6.17 and before had a .so with version same as VERSION_INFO
-# ldns-1.7.0 will have libversion 2:0:0
+# ldns-1.7.0 has libversion 2:0:0
+# ldns-1.7.1 will have libversion 2:1:0
 #
-AC_SUBST(VERSION_INFO, [2:0:0])
+AC_SUBST(VERSION_INFO, [2:1:0])
 
 AC_AIX
 if test "$ac_cv_header_minix_config_h" = "yes"; then
diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl
index f18498e2..79da2df0 100755
--- a/doc/doxyparse.pl
+++ b/doc/doxyparse.pl
@@ -52,8 +52,7 @@ MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.
 ";
 my $MAN_FOOTER = ".SH REMARKS
-This manpage was automatically generated from the ldns source code by
-use of Doxygen and some perl.
+This manpage was automatically generated from the ldns source code.
 ";
 
 getopts("em:",\%options);
diff --git a/makedist.sh b/makedist.sh
index 6ee5150d..2cb55851 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -54,7 +54,7 @@ question () {
 # working directory.
 cleanup () {
     info "Deleting temporary working directory."
-    cd $cwd && rm -rf $temp_dir
+    cd $cwd && rm -rf $temp_dir && rm -rf $doc_dir
 }
 
 error_cleanup () {
@@ -123,6 +123,7 @@ info "SNAPSHOT is $SNAPSHOT"
 # Creating temp directory
 info "Creating temporary working directory"
 temp_dir=`mktemp -d ldns-dist-XXXXXX`
+doc_dir=`mktemp -d ldns-dist-XXXXXX`
 info "Directory '$temp_dir' created."
 cd $temp_dir
 
@@ -206,6 +207,16 @@ info "Renaming LDNS directory to ldns-$version."
 cd ..
 mv ldns ldns-$version || error_cleanup "Failed to rename LDNS directory."
 
+info "Building the manpages"
+(
+ 	srcdir=`pwd`
+	cd "../$doc_dir"
+	"${srcdir}/ldns-$version/configure" --disable-dane
+	make manpages
+	cp -prv doc/ldns_manpages "${srcdir}/ldns-$version/doc/ldns_manpages"
+	cp -prv doc/man "${srcdir}/ldns-$version/doc/man"
+)
+
 tarfile="../ldns-$version.tar.gz"
 
 if [ -f $tarfile ]; then