build system: Support DESTDIR

diff --git a/Makefile.in b/Makefile.in
index 976a1595d3cc70c3ebc5b5da01ff9de98457d81d..7fbac7ee68c010172806039be57a2421e0338e36 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,10 +75,10 @@ adnshost.txt: all
 
 web-install: adnshost.txt
        test -e $(WEBDIR) || mkdir $(WEBDIR)
-       $(INSTALL_DATA) $(srcdir)/README.html $(WEBDIR)/
-       $(INSTALL_DATA) $(srcdir)/src/adns.h $(WEBDIR)/adns.h.txt
-       $(INSTALL_DATA) COPYING $(WEBDIR)/COPYING.txt
-       $(INSTALL_DATA) adnshost.txt $(WEBDIR)/
+       $(INSTALL_DATA) $(srcdir)/README.html $(DESTDIR)$(WEBDIR)/
+       $(INSTALL_DATA) $(srcdir)/src/adns.h $(DESTDIR)$(WEBDIR)/adns.h.txt
+       $(INSTALL_DATA) COPYING $(DESTDIR)$(WEBDIR)/COPYING.txt
+       $(INSTALL_DATA) adnshost.txt $(DESTDIR)$(WEBDIR)/
 
 check:                 all
        $(MAKE) -C regress check

diff --git a/client/Makefile.in b/client/Makefile.in
index 6264482505769ddcbfab38922cfbc38b8248128b..144eafd0f0176ea0bc42bac87767b8daf784da1a 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -58,9 +58,9 @@ ALL_OBJS=     $(ADH_OBJS) $(TARG_OBJS)
 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)
-               mkdir -p $(bindir)
+               $(INSTALL_DIR) $(DESTDIR)$(bindir)
                set -xe; for f in $(TARG_INSTALL); \
-                       do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
+                       do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done
 
 uninstall:
                for f in $(TARGETS); do rm -f $(bindir)/$$f; done

diff --git a/common.make.in b/common.make.in
index d5188d9355e22a20853ead8ed0dc2b54ddca11f8..e50eb85de3c0d8077bf26ae593f282160837c09e 100644 (file)
--- a/common.make.in
+++ b/common.make.in
@@ -71,4 +71,4 @@ endif
 
 INSTALL_PROGRAM=       $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA=          $(INSTALL) -m 644
-
+INSTALL_DIR=           $(INSTALL) -d 755

diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in
index 0083e1d5cb05800044c85a6d32e62b26c19fa8e8..52662a7ded37ff0255126f0dde29a7508c27415b 100644 (file)
--- a/dynamic/Makefile.in
+++ b/dynamic/Makefile.in
@@ -31,9 +31,9 @@ ALLOBJS=      $(addsuffix _p.o, $(basename $(LIBOBJS)))
 
 install:
                mkdir -p $(libdir)
-               $(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
-               ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
-               ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
+               $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE)
+               ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME)
+               ln -sf $(SHLIBSONAME) $(DESTDIR)$(libdir)/$(SHLIBFORLINK)
 
 uninstall:
                rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)

diff --git a/src/Makefile.in b/src/Makefile.in
index a84807e84e8edbf4ab801dfaec08429739bada9a..44ac07b87b29e669fb9d3ea66a5794e5c61c90f0 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -32,8 +32,10 @@ DIRCFLAGS=   -I. -I$(srcdir)
 install:
                mkdir -p $(libdir) $(includedir)
                set -xe; for f in $(TARGETS); \
-                       do $(INSTALL_DATA) $$f $(libdir)/$$f; done
-               $(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h
+                       do $(INSTALL_DIR) $(DESTDIR)$(libdir); \
+                           $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done
+               $(INSTALL_DIR)  $(DESTDIR)$(includedir)
+               $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h
 
 uninstall:
                for f in $(TARGETS); do rm -f $(libdir)/$$f; done