[gnus git] branch master updated: m0-3-80-g8fe8dd7 =2= Have the Makefiles respect DESTDIR ; Add hooks for gcc handling
Lars Magne Ingebrigtsen <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 8fe8dd766155cfe790148f4ae70db6520d582a1b (commit)
via 5beb390633ce1e32cdf319c6ba19926244bbfdf2 (commit)
from dae6632b59369b37baaee9a752b09b6fb61cd8d9 (commit)
- Log -----------------------------------------------------------------
commit 8fe8dd766155cfe790148f4ae70db6520d582a1b
Author: Elias Pipping <[email protected]>
Date: Thu Mar 15 02:34:03 2012 +0100
Have the Makefiles respect DESTDIR
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 243f524..cd542ec 100644
--- 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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-15 Elias Pipping <[email protected]>
+
+ * Makefile.in: Respect DESTDIR.
+
2012-03-14 Christopher Schmidt <[email protected]>
* 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
--- 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
--- 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
commit 5beb390633ce1e32cdf319c6ba19926244bbfdf2
Author: Christopher Schmidt <[email protected]>
Date: Thu Mar 15 02:32:15 2012 +0100
Add hooks for gcc handling
* gnus-msg.el (gnus-inews-do-gcc): Add gnus-gcc-pre-body-encode-hook
and gnus-gcc-post-body-encode-hook.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 203e665..703550e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-14 Christopher Schmidt <[email protected]>
+
+ * gnus-msg.el (gnus-inews-do-gcc): Add gnus-gcc-pre-body-encode-hook
+ and gnus-gcc-post-body-encode-hook.
+
2012-03-10 Lars Magne Ingebrigtsen <[email protected]>
* gnus-group.el (gnus-group-expire-articles-1): Don't try to expire
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 5e163e4..ff250b8 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -313,6 +313,22 @@ If nil, the address field will always be empty after invoking
:group 'gnus-message
:type 'boolean)
+(defcustom gnus-gcc-pre-body-encode-hook nil
+ "A hook called before encoding the body of the Gcc copy of a message.
+The current buffer (when the hook is run) contains the message
+including the message header. Changes made to the message will
+only affect the Gcc copy, but not the original message."
+ :group 'gnus-message
+ :type 'hook)
+
+(defcustom gnus-gcc-post-body-encode-hook nil
+ "A hook called after encoding the body of the Gcc copy of a message.
+The current buffer (when the hook is run) contains the message
+including the message header. Changes made to the message will
+only affect the Gcc copy, but not the original message."
+ :group 'gnus-message
+ :type 'hook)
+
(autoload 'gnus-message-citation-mode "gnus-cite" nil t)
;;; Internal variables.
@@ -1642,7 +1658,9 @@ this is a reply."
(nnheader-set-temp-buffer " *acc*")
(setq message-options (with-current-buffer cur message-options))
(insert-buffer-substring cur)
+ (run-hooks 'gnus-gcc-pre-body-encode-hook)
(message-encode-message-body)
+ (run-hooks 'gnus-gcc-post-body-encode-hook)
(save-restriction
(message-narrow-to-headers)
(let* ((mail-parse-charset message-default-charset)
diff --git a/texi/ChangeLog b/texi/ChangeLog
index df08f5a..be92527 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-14 Christopher Schmidt <[email protected]>
+
+ * gnus.texi (Archived Messages): Mention gnus-gcc-pre-body-encode-hook
+ and gnus-gcc-post-body-encode-hook.
+
2012-02-28 Glenn Morris <[email protected]>
* gnus-faq.texi, gnus-news.texi, gnus.texi:
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 2520e63..0c40d56 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12675,6 +12675,19 @@ this is @code{no-gcc-self}, that is the default, resent messages will be
@code{Gcc} copied to groups that existing @code{Gcc} header specifies,
except for the current group.
+@item gnus-gcc-pre-body-encode-hook
+@vindex gnus-gcc-pre-body-encode-hook
+@itemx gnus-gcc-post-body-encode-hook
+@vindex gnus-gcc-post-body-encode-hook
+
+These hooks are run before/after encoding the message body of the Gcc
+copy of a sent message. The current buffer (when the hook is run)
+contains the message including the message header. Changes made to
+the message will only affect the Gcc copy, but not the original
+message. You can use these hooks to edit the copy (and influence
+subsequent transformations), e.g. remove MML secure tags
+(@pxref{Signing and encrypting}).
+
@end table
@@ -28329,6 +28342,25 @@ New features in No Gnus:
I'm sure there will be lots of text here. It's really spelled 真
Gnus.
+New features in Ma Gnus:
+
+@itemize @bullet
+
+@item Changes in Message mode and related Gnus features
+@c ****************************************************
+
+@itemize @bullet
+
+@item
+The new hooks @code{gnus-gcc-pre-body-encode-hook} and
+@code{gnus-gcc-post-body-encode-hook} are run before/after encoding
+the message body of the Gcc copy of a sent message. See
+@xref{Archived Messages}.
+
+@end itemize
+
+@end itemize
+
@iftex
@page
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
etc/Makefile.in | 20 ++++++++++----------
lisp/ChangeLog | 9 +++++++++
lisp/Makefile.in | 30 +++++++++++++++---------------
lisp/gnus-msg.el | 18 ++++++++++++++++++
texi/ChangeLog | 5 +++++
texi/Makefile.in | 16 ++++++++--------
texi/gnus.texi | 32 ++++++++++++++++++++++++++++++++
7 files changed, 97 insertions(+), 33 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project