changelog: Document changes in 1.6.0 and finalise version number

[adns.git] / common.make.in

diff --git a/common.make.in b/common.make.in
index 590ffaf91974b290ea9cc5084c3ac374640afaeb..d5188d9355e22a20853ead8ed0dc2b54ddca11f8 100644 (file)
--- a/common.make.in
+++ b/common.make.in
@@ -2,7 +2,7 @@
 #  used by autoconf/configure to generate settings.make
 #  
 #  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016  Ian Jackson
+#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
 #    Copyright (C) 2014  Mark Wooding
 #    Copyright (C) 1999-2000,2003,2006  Tony Finch
 #    Copyright (C) 1991 Massachusetts Institute of Technology
@@ -22,7 +22,7 @@
 #  along with this program; if not, write to the Free Software Foundation.
 
 MAJOR=         1
-MINOR=         5
+MINOR=         6
 SHLIBFILE=     @SHLIBFILE@
 SHLIBSONAME=   @SHLIBSONAME@
 SHLIBFORLINK=  @SHLIBFORLINK@
@@ -45,11 +45,22 @@ MKSHLIB_1=  @MKSHLIB_1@
 MKSHLIB_2=     @MKSHLIB_2@
 MKSHLIB_3=     @MKSHLIB_3@
 
-prefix=                @prefix@
-exec_prefix=   @exec_prefix@
-bindir=                @bindir@
-libdir=                @libdir@
-includedir=    @includedir@
+prefix         := @prefix@
+exec_prefix    := @exec_prefix@
+bindir         := @bindir@
+libdir         := @libdir@
+includedir     := @includedir@
+
+ifneq ($(DESTDIR),)
+# autoconf likes to define some of these in terms of each other
+# so if we want to add a prefix to each one we have to do it this way:
+destdir_prefix=$(DESTDIR)/
+prefix         := ${destdir_prefix}${prefix}
+exec_prefix    := ${destdir_prefix}${exec_prefix}
+bindir         := ${destdir_prefix}${bindir}
+libdir         := ${destdir_prefix}${libdir}
+includedir     := ${destdir_prefix}${includedir}
+endif
 
 AC_INSTALL=    @INSTALL@
 ifeq ($(AC_INSTALL),./install-sh -c)