Have the Makefiles respect DESTDIR

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 243f524..cd542ec 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -15,13 +15,13 @@ INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 
 install:
-       $(SHELL) $(top_srcdir)/mkinstalldirs "$(etcdir)"
+       $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(etcdir)"
        @cd $(srcdir) \
        && for p in gnus-tut.txt; do \
-         echo "$(INSTALL_DATA) \"$$p $(etcdir)/$$p\""; \
-         $(INSTALL_DATA) $$p "$(etcdir)/$$p"; \
+         echo "$(INSTALL_DATA) \"$$p $(DESTDIR)$(etcdir)/$$p\""; \
+         $(INSTALL_DATA) $$p "$(DESTDIR)$(etcdir)/$$p"; \
        done
-       $(SHELL) $(top_srcdir)/mkinstalldirs "$(etcdir)/images/gnus" "$(etcdir)/images/mail"
+       $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(etcdir)/images/gnus" "$(DESTDIR)$(etcdir)/images/mail"
        @cd $(srcdir) \
        && for p in images/gnus/*.pbm images/gnus/*.png images/gnus/*.svg \
                    images/gnus/*.xbm images/gnus/*.xpm \
@@ -30,12 +30,12 @@ install:
                    images/*.pbm images/*.png images/*.svg images/*.xbm \
                    images/*.xpm; do \
          if test -f $$p; then \
-           echo "$(INSTALL_DATA) $$p \"$(etcdir)/$$p\""; \
-           $(INSTALL_DATA) $$p "$(etcdir)/$$p"; \
+           echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(etcdir)/$$p\""; \
+           $(INSTALL_DATA) $$p "$(DESTDIR)$(etcdir)/$$p"; \
          fi; \
        done
-       $(SHELL) $(top_srcdir)/mkinstalldirs "$(etcdir)/images/smilies" \
-         "$(etcdir)/images/smilies/grayscale" "$(etcdir)/images/smilies/medium"
+       $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(etcdir)/images/smilies" \
+         "$(DESTDIR)$(etcdir)/images/smilies/grayscale" "$(DESTDIR)$(etcdir)/images/smilies/medium"
        @cd $(srcdir) \
        && for p in images/smilies/*.pbm images/smilies/*.png \
                    images/smilies/*.svg images/smilies/*.xbm \
@@ -49,8 +49,8 @@ install:
                    images/smilies/medium/*.svg images/smilies/medium/*.xbm \
                    images/smilies/medium/*.xpm; do \
          if test -f $$p; then \
-           echo "$(INSTALL_DATA) $$p \"$(etcdir)/$$p\""; \
-           $(INSTALL_DATA) $$p "$(etcdir)/$$p"; \
+           echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(etcdir)/$$p\""; \
+           $(INSTALL_DATA) $$p "$(DESTDIR)$(etcdir)/$$p"; \
          fi; \
        done
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 703550e..f23cf88 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-15  Elias Pipping  <pipping@lavabit.com>
+
+       * Makefile.in: Respect DESTDIR.
+
 2012-03-14  Christopher Schmidt  <christopher@ch.ristopher.com>
 
         * gnus-msg.el (gnus-inews-do-gcc): Add gnus-gcc-pre-body-encode-hook

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 776d5ef..a645315 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -46,36 +46,36 @@ test-nntp:
 
 # This entry will never install .el files if there are no .elc files.
 install-el: gnus-load.el
-       $(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
-       $(INSTALL_DATA) gnus-load.el "$(lispdir)/gnus-load.el"
+       $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
+       $(INSTALL_DATA) gnus-load.el "$(DESTDIR)$(lispdir)/gnus-load.el"
        @for p in *.elc; do \
          p=`basename $$p c`; \
          if [ -f "$(srcdir)/$$p" ]; then \
-           echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
-           $(INSTALL_DATA) $(srcdir)/$$p "$(lispdir)/$$p"; \
+           echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
+           $(INSTALL_DATA) $(srcdir)/$$p "$(DESTDIR)$(lispdir)/$$p"; \
          fi; \
        done
 
 install-elc: clever
        rm -f dgnushack.elc
-       $(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
+       $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
        @for p in *.elc; do \
-         echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
-         $(INSTALL_DATA) $$p "$(lispdir)/$$p"; \
+         echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
+         $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p"; \
        done
 
 install-el-elc: clever
        rm -f dgnushack.elc
-       $(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
-       $(INSTALL_DATA) gnus-load.el "$(lispdir)/gnus-load.el"
+       $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
+       $(INSTALL_DATA) gnus-load.el "$(DESTDIR)$(lispdir)/gnus-load.el"
        @for p in *.elc; do \
          q=`basename $$p c`; \
          if [ -f "$(srcdir)/$$q" ]; then \
-           echo "$(INSTALL_DATA) $$q \"$(lispdir)/$$q\""; \
-           $(INSTALL_DATA) $(srcdir)/$$q "$(lispdir)/$$q"; \
+           echo "$(INSTALL_DATA) $$q \"$(DESTDIR)$(lispdir)/$$q\""; \
+           $(INSTALL_DATA) $(srcdir)/$$q "$(DESTDIR)$(lispdir)/$$q"; \
          fi; \
-         echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
-         $(INSTALL_DATA) $$p "$(lispdir)/$$p"; \
+         echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
+         $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p"; \
        done
 
 list-installed-shadows:
@@ -86,11 +86,11 @@ remove-installed-shadows:
 
 uninstall:
        for p in *.elc; do \
-         rm -f "$(lispdir)/$$p"; \
+         rm -f "$(DESTDIR)$(lispdir)/$$p"; \
        done
        cd $(srcdir); \
        for p in *.el; do \
-         rm -f "$(lispdir)/$$p"; \
+         rm -f "$(DESTDIR)$(lispdir)/$$p"; \
        done
 
 tags:

diff --git a/texi/Makefile.in b/texi/Makefile.in
index da2735c..5120271 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -198,21 +198,21 @@ distclean: clean
        rm -f gnusconfig.tex
 
 install: $(INFO_DEPS)
-       $(SHELL) $(top_srcdir)/mkinstalldirs "$(infodir)"
+       $(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(infodir)"
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
          for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
            if test -f $$ifile; then \
-             echo "$(INSTALL_DATA) $$ifile \"$(infodir)/$$ifile\""; \
-             $(INSTALL_DATA) $$ifile "$(infodir)/$$ifile"; \
+             echo "$(INSTALL_DATA) $$ifile \"$(DESTDIR)$(infodir)/$$ifile\""; \
+             $(INSTALL_DATA) $$ifile "$(DESTDIR)$(infodir)/$$ifile"; \
            else : ; fi; \
          done; \
        done
        @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
-           echo "install-info --info-dir=\"$(infodir)\" \"$(infodir)/$$file\"";\
-           install-info --info-dir="$(infodir)" "$(infodir)/$$file" || :;\
+           echo "install-info --info-dir=\"$(DESTDIR)$(infodir)\" \"$(DESTDIR)$(infodir)/$$file\"";\
+           install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$file" || :;\
          done; \
        else : ; fi
 
@@ -220,14 +220,14 @@ uninstall:
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
          for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-           rm -f "$(infodir)/$$ifile"; \
+           rm -f "$(DESTDIR)$(infodir)/$$ifile"; \
          done; \
        done
        @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
-           echo "install-info --delete --info-dir=\"$(infodir)\" \"$(infodir)/$$file\"";\
-           install-info --delete --info-dir="$(infodir)" "$(infodir)/$$file" || :;\
+           echo "install-info --delete --info-dir=\"$(DESTDIR)$(infodir)\" \"$(DESTDIR)$(infodir)/$$file\"";\
+           install-info --delete --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$file" || :;\
          done; \
        else : ; fi