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

[adns] / settings.make.in

diff --git a/settings.make.in b/settings.make.in
index 48e98de..f1ae5cb 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -1,12 +1,11 @@
-# settings.make.in - main configuration settings for Makefiles,
+# settings.make[.in] - main configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  
-#  This file is
-#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
-#
-#  It is part of adns, which is
-#    Copyright (C) 1997-2005 Ian Jackson <ian@davenant.greenend.org.uk>
-#    Copyright (C) 1999-2004 Tony Finch <dot@dotat.at>
+#  This file is part of adns, which is
+#    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+#    Copyright (C) 1999-2000,2003,2006  Tony Finch
+#    Copyright (C) 1991 Massachusetts Institute of Technology
+#  (See the file INSTALL for full details.)
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -48,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)