gitignore: Move debian/ entries to debian/.gitignore

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6221dabd0b9491fc3dc038b31dd30d738d1f3796..35a405f78cecb0b66d94022b221538e5a827c385 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,26 +76,31 @@ all:                $(TARGETS)
 docs:          $(TARGETS_DOC)
 
 install:       all
-               $(INSTALL_PROGRAM) -m 755 daemon $(sbindir)/uservd
-               $(INSTALL_PROGRAM) -m 4755 client $(bindir)/userv
+               $(INSTALL) -d $(addprefix $(DESTDIR), $(bindir) $(sbindir))
+               $(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 $(DESTDIR)$(etcsubdir)/$$f; then   \
+                               $(INSTALL_DATA) $$f $(DESTDIR)$(etcsubdir); \
+                       fi;                                             \
                done
-               if test ! -f $(etcsubdir)/system.default; then \
-                       $(INSTALL_DATA) system.default $(etcsubdir); fi
-               if test ! -f $(etcsubdir)/system.override; then \
-                       $(INSTALL_DATA) system.override $(etcsubdir); fi
 
 install-strip:
                $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 install-doc:   $(TARGETS_DOC)
-               $(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
-               $(INSTALL) -d -m 2755 $(mandir) $(man1dir) $(man8dir)
-               $(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) -d -m 2755 $(addprefix $(DESTDIR),   \
+                       $(docdir) $(docdir)/spec.html           \
+                       $(mandir) $(man1dir) $(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