X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=etc%2FMakefile.in;h=8fb3ea2fc1fcb5334ef9e2eef9b3a1e7e6b94b9f;hb=8a5d5abeee6212629a14bd80abe2c97a07d609fb;hp=20ea6d525f6e82f47b44a841ffe7a1d90df455b7;hpb=35c228531bc8e00d43be590255df9408a4fcbe19;p=mmh

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 20ea6d5..8fb3ea2 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -83,13 +83,13 @@ sendfiles: $(srcdir)/sendfiles.in Makefile
 install: install-bin-files install-etc-files
 
 install-bin-files:
-	$(top_srcdir)/mkinstalldirs $(bindir)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
 	for script in $(GENERATED_BIN_FILES); do \
-	  $(INSTALL_PROGRAM) $$script $(bindir)/$$script; \
+	  $(INSTALL_PROGRAM) $$script $(DESTDIR)$(bindir)/$$script; \
 	done
 
 install-etc-files:
-	$(top_srcdir)/mkinstalldirs $(etcdir)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
 	INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
 	for file in $(STATIC_FILES); do \
 	  INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
@@ -97,11 +97,11 @@ install-etc-files:
 	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) $$path $(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";\
@@ -111,7 +111,7 @@ install-etc-files:
 	      echo; \
 	    fi; \
 	  else \
-	    $(INSTALL_DATA) $$path $(etcdir)/$$file; \
+	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
 	  fi; \
 	done
 
@@ -119,12 +119,12 @@ uninstall: uninstall-bin-files uninstall-etc-files
 
 uninstall-bin-files:
 	for script in $(GENERATED_BIN_FILES); do \
-	  rm -f $(bindir)/$$script; \
+	  rm -f $(DESTDIR)$(bindir)/$$script; \
 	done
 
 uninstall-etc-files:
 	for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
-	  rm -f $(etcdir)/$$file; \
+	  rm -f $(DESTDIR)$(etcdir)/$$file; \
 	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========