+ * Use autoconf's values for {bin,lib,include}_dir rather than inventing

@@ -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 bb2d2d886e688ebb54473e4f97267135d80781c9..7d370dd4a93ebccb9122fd2ddf7e1f0d51f68dd8 100644 (file)
--- 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 f023ca8031ae4e504aa30001df00b40fba0a38c3..f1ae5cb2b6f38442c9fd0169a3d5ca48a4042295 100644 (file)
--- 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)