Bugfix#413: Thanks Brad Smith

Fix installation of the ldns-config.1 manpage to come from $(srcdir) so that srcdir may be different then builddir.

Removed unused variable from dnssec.c.

diff --git a/Changelog b/Changelog
index f32ca3f55b2f8f5c62880bbeb4aad4e0df1b08f4..2e85fd86c348018d32dddc778f8eb705be0d5dc4 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,5 @@
 1.6.12
-       * 
+       * bugfix #413: Fix manpage source for srcdir != builddir
 
 1.6.11 2011-09-29
        * bugfix #394: Fix socket leak on errors

diff --git a/Makefile.in b/Makefile.in
index e1399acc4a5347df16309ee8253861f89aa17dfe..33944f3d7092738bb930751254f20ba48a56ef08 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,7 +216,7 @@ install-manpages:   manpages
                done
                if [ $(INSTALL_LDNS_CONFIG) = "yes" ] ; then \
                        ${INSTALL} -d $(DESTDIR)$(mandir)/man1; \
-                       ${INSTALL} -c -m 444 packaging/ldns-config.1 $(DESTDIR)$(mandir)/man1/; \
+                       ${INSTALL} -c -m 444 $(srcdir)/packaging/ldns-config.1 $(DESTDIR)$(mandir)/man1/; \
                fi
 
 uninstall-manpages:

diff --git a/dnssec.c b/dnssec.c
index b36e3f355de12a2eaab5a0a416989adfb1a4fb7c..45430cd4b85f29d5e0a9cd5e5bc439b7e7b6ac6c 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -105,7 +105,6 @@ ldns_dnssec_nsec3_closest_encloser(ldns_rdf *qname,
        uint8_t *salt;
 
        ldns_rdf *sname, *hashed_sname, *tmp;
-       ldns_rr *ce;
        bool flag;
 
        bool exact_match_found;
@@ -131,7 +130,6 @@ ldns_dnssec_nsec3_closest_encloser(ldns_rdf *qname,
 
        sname = ldns_rdf_clone(qname);
 
-       ce = NULL;
        flag = false;
 
        zone_name = ldns_dname_left_chop(ldns_rr_owner(nsec));