Fix all Makefiles. make DESTDIR=/path/to/something install should

work now.

diff --git a/Makefile.am b/Makefile.am
index 8c1b8813abbd02e0266da14c5c648b8c3fafedfa..85affc340e45afb84e9ff594872cf2c8838fafdf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,27 +63,27 @@ reldate:
        echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
 
 install-exec-local:
-       if test -f $(bindir)/mutt.dotlock && test -f $(bindir)/mutt_dotlock ; then      \
-               rm -f $(bindir)/mutt.dotlock ;          \
-               ln -sf $(bindir)/mutt_dotlock $(bindir)/mutt.dotlock ; \
+       if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then  \
+               rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;                \
+               ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
        fi
        if test -f $(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
-               chgrp @DOTLOCK_GROUP@ $(bindir)/mutt_dotlock ; \
-               chmod @DOTLOCK_PERMISSION@  $(bindir)/mutt_dotlock ; \
+               chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock ; \
+               chmod @DOTLOCK_PERMISSION@  $(DESTDIR)$(bindir)/mutt_dotlock ; \
        fi
 
 install-data-local:
-       $(srcdir)/mkinstalldirs $(sharedir)
-       $(srcdir)/mkinstalldirs $(sysconfdir)
-       -if [ -f $(sharedir)/Muttrc ] ; then \
-               mv $(sharedir)/Muttrc $(sysconfdir) ; \
-       elif [ -f $(sharedir)/../Muttrc ] ; then \
-               mv $(sharedir)/../Muttrc $(sysconfdir) ; \
-       elif [ ! -f $(sysconfdir)/Muttrc ] ; then \
-               $(INSTALL) -m 644 $(srcdir)/Muttrc $(sysconfdir) ; \
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+       -if [ -f $(DESTDIR)$(sharedir)/Muttrc ] ; then \
+               mv $(DESTDIR)$(sharedir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
+       elif [ -f $(DESTDIR)$(sharedir)/../Muttrc ] ; then \
+               mv $(DESTDIR)$(sharedir)/../Muttrc $(DESTDIR)$(sysconfdir) ; \
+       elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
+               $(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
        fi
-       -if [ ! -f $(sysconfdir)/mime.types ]; then \
-               $(INSTALL) -m 644 $(srcdir)/mime.types $(sysconfdir); \
+       -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
+               $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
        fi
 
 

diff --git a/charsets/Makefile.in b/charsets/Makefile.in
index 0097e2f45a45d1f382080a9ffcae632069ee91c2..fad46d9fea87ec39ab09d296a86e97b15577c383 100644 (file)
--- a/charsets/Makefile.in
+++ b/charsets/Makefile.in
@@ -56,13 +56,13 @@ charmaps charsets.list: parse_i18n
        cd $(srcdir) && sh ./gen_charsets
 
 install: charsets.list
-       $(srcdir)/../mkinstalldirs $(sharedir)/charsets
+       $(srcdir)/../mkinstalldirs $(DESTDIR)$(sharedir)/charsets
        ( cd $(srcdir) && $(INSTALL) \
-               -m 644 `cat charsets.list` $(sharedir)/charsets )
-       $(INSTALL) -m 644 charsets.alias $(sharedir)/charsets/charsets.alias.dist
-       test -f $(sharedir)/charsets/charsets.alias ||                  \
-         $(INSTALL) -m 644 $(sharedir)/charsets/charsets.alias.dist    \
-                       $(sharedir)/charsets/charsets.alias
+               -m 644 `cat charsets.list` $(DESTDIR)$(sharedir)/charsets )
+       $(INSTALL) -m 644 charsets.alias $(DESTDIR)$(sharedir)/charsets/charsets.alias.dist
+       test -f $(DESTDIR)$(sharedir)/charsets/charsets.alias ||                        \
+         $(INSTALL) -m 644 $(DESTDIR)$(sharedir)/charsets/charsets.alias.dist  \
+               $(DESTDIR)$(sharedir)/charsets/charsets.alias
 
 Makefile: ../config.status Makefile.in
        cd .. \

diff --git a/doc/Makefile.in b/doc/Makefile.in
index bc0d4b45eb9c171070db6f14a1f9b0f00485a432..8aa7bc0f2510794862e05d6a443821df1ffe0abe 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -60,25 +60,25 @@ try-txt:
 html: manual.html
 
 install: dotlock.man mutt.man all
-       $(top_srcdir)/mkinstalldirs $(mandir)/man1
-       $(INSTALL) -m 644 mutt.man $(mandir)/man1/mutt.1
-       $(INSTALL) -m 644 dotlock.man $(mandir)/man1/mutt_dotlock.1
-       $(top_srcdir)/mkinstalldirs $(docdir)
-       for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(docdir) ; done
-       for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(docdir) ; done
-       for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(docdir) ; done
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -m 644 mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
+       $(INSTALL) -m 644 dotlock.man $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+       for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done
+       for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done
+       for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done
        if [ -f manual.html ] ; then \
                $(MAKE) install-html ; \
        fi
                
 install-html: html
-       $(top_srcdir)/mkinstalldirs $(docdir)/html
-       for f in manual*.html ; do $(INSTALL) -m 644 $$f $(docdir)/html ; done
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
+       for f in manual*.html ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/html ; done
 
 
 uninstall:
-       -rm -f $(mandir)/man1/mutt.1
-       -rm -rf $(docdir)
+       -rm -f $(DESTDIR)$(mandir)/man1/mutt.1
+       -rm -rf $(DESTDIR)$(docdir)
 
 manual.txt: manual.sgml
        sgml2txt -c latin manual

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c91c9809513e80bc6dcf1de7f3122095dc9cf122..4659a88fb3ee9852f7007c6d90b0ced550e18ec7 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -116,9 +116,9 @@ install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
        if test -r "$(MKINSTALLDIRS)"; then \
-         $(MKINSTALLDIRS) $(datadir); \
+         $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
        else \
-         $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+         $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
        fi
        @catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
@@ -130,27 +130,27 @@ install-data-yes: all
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
          dir=$$destdir/$$lang/LC_MESSAGES; \
          if test -r "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $$dir; \
+           $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
          else \
-           $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+           $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
          fi; \
          if test -r $$cat; then \
-           $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-           echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+           $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
+           echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
          else \
-           $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+           $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
            echo "installing $(srcdir)/$$cat as" \
-                "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+                "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
          fi; \
          if test -r $$cat.m; then \
-           $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-           echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+           $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+           echo "installing $$cat.m as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
          else \
            if test -r $(srcdir)/$$cat.m ; then \
              $(INSTALL_DATA) $(srcdir)/$$cat.m \
-               $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+               $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
              echo "installing $(srcdir)/$$cat as" \
-                  "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+                  "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
            else \
              true; \
            fi; \