Installation: Honour DESTDIR

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile.in b/Makefile.in
index 8dc3098e6534adac288e7bc7e4ca1686de646333..b14344ae005ff4949fe39b8e67ac1ccfde29c558 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,14 +76,14 @@ all:                $(TARGETS)
 docs:          $(TARGETS_DOC)
 
 install:       all
-               $(INSTALL_PROGRAM) -m 755 daemon $(sbindir)/uservd
-               $(INSTALL_PROGRAM) -m 4755 client $(bindir)/userv
+               $(INSTALL_PROGRAM) -m 755 daemon $(DESTDIR)$(sbindir)/uservd
+               $(INSTALL_PROGRAM) -m 4755 client $(DESTDIR)$(bindir)/userv
                set -e; for f in '' /default.d /services.d /override.d; do \
-                       $(INSTALL) -d -m 2755 $(etcsubdir)$$f;          \
+                       $(INSTALL) -d -m 2755 $(DESTDIR)$(etcsubdir)$$f; \
                done
                set -e; for f in system.default system.override; do     \
-                       if test ! -f $(etcsubdir)/$$f; then             \
-                               $(INSTALL_DATA) $$f $(etcsubdir);       \
+                       if test ! -f $(DESTDIR)$(etcsubdir)/$$f; then   \
+                               $(INSTALL_DATA) $$f $(DESTDIR)$(etcsubdir); \
                        fi;                                             \
                done
 
@@ -93,12 +93,13 @@ install-strip:
 install-doc:   $(TARGETS_DOC)
                set -e; for f in $(docdir) $(docdir)/spec.html  \
                                $(mandir) $(man1dir) $(man8dir); do     \
-                       $(INSTALL) -d -m 2755 $$f;                      \
+                       $(INSTALL) -d -m 2755 $(DESTDIR)$$f;            \
                done
-               $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
-               $(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
-               $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(man1dir)
-               $(INSTALL_DATA) -m 644 $(MAN8PAGES) $(man8dir)
+               $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(DESTDIR)$(docdir)/.
+               $(INSTALL_DATA) -m 644 spec.html/*.html \
+                       $(DESTDIR)$(docdir)/spec.html/.
+               $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(DESTDIR)$(man1dir)
+               $(INSTALL_DATA) -m 644 $(MAN8PAGES) $(DESTDIR)$(man8dir)
 
 uninstall:
                rm -f $(bindir)/userv $(sbindir)/uservd