prepend DESTDIR to install locations

[mmh] / etc / Makefile.in

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 1801d68..8fb3ea2 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -54,12 +54,6 @@ GENERATED_BIN_FILES = sendfiles
 # non-scripts generated using above GENERATED_FILE_SRCs
 GENERATED_ETC_FILES = mhn.defaults mts.conf
 
-# scripts we need to install (in bin)
-INSTALL_BIN_FILES = $(GENERATED_BIN_FILES)
-
-# non-scripts we need to install (in etc)
-INSTALL_ETC_FILES = $(STATIC_FILES) $(GENERATED_ETC_FILES)
-
 # auxiliary files (included in distribution but not installed)
 AUX = Makefile.in
 
@@ -89,20 +83,25 @@ sendfiles: $(srcdir)/sendfiles.in Makefile
 install: install-bin-files install-etc-files
 
 install-bin-files:
-       $(top_srcdir)/mkinstalldirs $(bindir)
-       for script in $(INSTALL_BIN_FILES); do \
-         $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+       for script in $(GENERATED_BIN_FILES); do \
+         $(INSTALL_PROGRAM) $$script $(DESTDIR)$(bindir)/$$script; \
        done
 
 install-etc-files:
-       $(top_srcdir)/mkinstalldirs $(etcdir)
-       for file in $(INSTALL_ETC_FILES); do \
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
+       INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
+       for file in $(STATIC_FILES); do \
+         INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
+       done; \
+       for path in $$INSTALL_FILES; do \
+         file=`basename $$path`; \
          echo "Installing $$file..."; \
-         if [ -f $(etcdir)/$$file ]; then \
-           mv $(etcdir)/$$file $(etcdir)/$$file.prev; \
-           $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
-           if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
-             rm $(etcdir)/$$file.prev; \
+         if [ -f $(DESTDIR)$(etcdir)/$$file ]; then \
+           mv $(DESTDIR)$(etcdir)/$$file $(DESTDIR)$(etcdir)/$$file.prev; \
+           $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
+           if diff $(DESTDIR)$(etcdir)/$$file.prev $(DESTDIR)$(etcdir)/$$file; then \
+             rm $(DESTDIR)$(etcdir)/$$file.prev; \
            else \
              echo; \
              echo "  Previous version of $$file saved as $$file.prev due\c";\
@@ -112,20 +111,20 @@ install-etc-files:
              echo; \
            fi; \
          else \
-           $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
+           $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
          fi; \
        done
 
 uninstall: uninstall-bin-files uninstall-etc-files
 
 uninstall-bin-files:
-       for script in $(INSTALL_BIN_FILES); do \
-         rm -f $(bindir)/$$script; \
+       for script in $(GENERATED_BIN_FILES); do \
+         rm -f $(DESTDIR)$(bindir)/$$script; \
        done
 
 uninstall-etc-files:
-       for file in $(INSTALL_ETC_FILES); do \
-         rm -f $(etcdir)/$$file; \
+       for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
+         rm -f $(DESTDIR)$(etcdir)/$$file; \
        done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
@@ -148,7 +147,7 @@ superclean: realclean
 subdir = etc
 
 Makefile: Makefile.in ../config.status
-       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+       cd .. && ./config.status $(subdir)/$@
  
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)