Support DESTDIR=/some/absolute/path on `make install'

[adns.git] / common.make.in

diff --git a/common.make.in b/common.make.in
index 0f6df156bedf270821c071347b70a6c435106065..5e0e80b32a0ae43ef6bce75b330489f4522a0de1 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  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
@@ -33,7 +33,7 @@ LDFLAGS=      $(AUTOLDFLAGS) $(DIRLDFLAGS) $(XLDFLAGS)
 LDLIBS=                @LIBS@ $(XLIBS)
 AUTOCFLAGS=    @CFLAGS@
 AUTOLDFLAGS=   @LDFLAGS@
-WARNS=         @WARNS@
+WARNS=         @WARNS@ -Wno-unused-value
 #WERROR=       -Werror
 
 M4=            m4
@@ -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)