X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/0ebff22d9b5832b18444f7c680ca71e24fc3734e..0447b87038b169c83c4a133acfd9f7f9a5d519d1:/settings.make.in

diff --git a/settings.make.in b/settings.make.in
index f276a6a..f1ae5cb 100644
--- 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-2000 Ian Jackson <ian@davenant.greenend.org.uk>
-#    Copyright (C) 1999 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
@@ -22,8 +21,8 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-MAJOR=		0
-MINOR=		1
+MAJOR=		1
+MINOR=		2
 SHLIBFILE=	@SHLIBFILE@
 SHLIBSONAME=	@SHLIBSONAME@
 SHLIBFORLINK=	@SHLIBFORLINK@
@@ -48,11 +47,17 @@ 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)
+INSTALL=	$(srcdir)/../$(AC_INSTALL)
+else
+INSTALL=	$(AC_INSTALL)
+endif
 
-INSTALL=		@INSTALL@
 INSTALL_PROGRAM=	$(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA=		$(INSTALL) -m 644