From: ian <ian>
Date: Tue, 9 May 2006 19:43:07 +0000 (+0000)
Subject: @@ -5,6 +5,9 @@
X-Git-Tag: wip.base.getaddrinfo~42
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/adns/commitdiff_plain/5f2db417c57d3c73001a5b67bcf1ed314a38ca2e

@@ -5,6 +5,9 @@
     as is required.  (Report from Jim Meyering.)
+  * Use autoconf's values for {bin,lib,include}_dir rather than inventing
+    our own from @exec_prefix@, making configure --libdir work.
+    (Patch from Mihai Ibanescu.)
---

diff --git a/changelog b/changelog
index bb2d2d8..7d370dd 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ adns (1.3); urgency=low
     suppress spurious autoconf error.  (Report from Mihai Ibanescu.)
   * Cast ptrdiff_t to int for %.*s length in adnsheloex and adnslogres,
     as is required.  (Report from Jim Meyering.)
+  * Use autoconf's values for {bin,lib,include}_dir rather than inventing
+    our own from @exec_prefix@, making configure --libdir work.
+    (Patch from Mihai Ibanescu.)
 
  --
 
diff --git a/settings.make.in b/settings.make.in
index f023ca8..f1ae5cb 100644
--- a/settings.make.in
+++ b/settings.make.in
@@ -47,9 +47,9 @@ MKSHLIB_3=	@MKSHLIB_3@
 
 prefix=		@prefix@
 exec_prefix=	@exec_prefix@
-bin_dir=	$(exec_prefix)/bin
-lib_dir=	$(exec_prefix)/lib
-include_dir=	$(prefix)/include
+bin_dir=	@bindir@
+lib_dir=	@libdir@
+include_dir=	@includedir@
 
 AC_INSTALL=	@INSTALL@
 ifeq ($(AC_INSTALL),./install-sh -c)