X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=common.make.in;h=d5188d9355e22a20853ead8ed0dc2b54ddca11f8;hb=HEAD;hp=590ffaf91974b290ea9cc5084c3ac374640afaeb;hpb=a4fee17d011690ab8bb854df3479e250fe83448f;p=adns.git

diff --git a/common.make.in b/common.make.in
index 590ffaf..5a5ba4d 100644
--- a/common.make.in
+++ b/common.make.in
@@ -1,12 +1,8 @@
 #  common.make[.in] - common configuration settings for Makefiles,
 #  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) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (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,7 +18,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 +41,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)
@@ -60,4 +67,4 @@ endif
 
 INSTALL_PROGRAM=	$(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA=		$(INSTALL) -m 644
-
+INSTALL_DIR=		$(INSTALL) -d 755