Documentation updates; autogeneration of documentation from init.h.

2 files changed, 19 insertions, 10 deletions

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 02642fba..f0f3843e 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -15,6 +15,7 @@ srcdir=@srcdir@
 docdir=@docdir@
 top_srcdir=@top_srcdir@
 top_builddir=..
+INSTALL=@INSTALL@
 VPATH=@srcdir@
 @SET_MAKE@
 
@@ -24,7 +25,15 @@ DISTFILES=Mush.rc Pine.rc Makefile.in language.txt language50.txt 	\
 	patch.slang-1.2.2.keypad.1 sample.muttrc  sample.mailcap	\
 	pgp2.rc pgp5.rc gpg.rc
 
-install all clean distclean:
+SAMPLES=Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc
+
+all clean distclean:
+
+install:
+	$(top_srcdir)/mkinstalldirs @docdir@/samples
+	for f in $(SAMPLES) ; do \
+		$(INSTALL) -m 644 $$f @docdir@/samples ;	\
+	done
 
 maintainer-clean:
 	-rm -f Makefile
@@ -32,7 +41,7 @@ maintainer-clean:
 Makefile: ../config.status Makefile.in
 	cd .. \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-			  
+
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: Makefile $(DISTFILES)
 	for file in $(DISTFILES) ; do				\
diff --git a/contrib/gpg.rc b/contrib/gpg.rc
index 538f3f71..4bf77400 100644
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
@@ -15,26 +15,26 @@ set pgp_verify_command="gpg --no-verbose --batch -o - --verify %s %f"
 set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --batch -o - --decrypt %f"
 
 # create a pgp/mime signed attachment
-set pgp_sign_command="gpg --no-verbose --batch -o - --passphrase-fd 0 --detach-sign --textmode --armor %?a?-u %a? %f"
+set pgp_sign_command="gpg --no-verbose --batch -o - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
 
 # create a pgp/mime encrypted attachment
-set pgp_encrypt_only_command="pgpewrap gpg --no-verbose -v --batch -o - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_only_command="cat - %f | pgpewrap gpg --no-verbose -v --batch -o - --encrypt --armor --always-trust -- -r %r"
 
 # create a pgp/mime encrypted and signed attachment
-set pgp_encrypt_sign_command="pgpewrap gpg --passphrase-fd 0 --no-verbose -v --batch -o - --encrypt --sign %?a?-u %a? --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="cat - %f | pgpewrap gpg --passphrase-fd 0 --no-verbose -v --batch -o - --encrypt --sign --textmode %?a?-u %a? --armor --always-trust -- -r %r"
 
 # import a key into the public key ring
-set pgp_import_command="gpgm --no-verbose --import -v %f"
+set pgp_import_command="gpg --no-verbose --import -v %f"
 
 # export a key from the public key ring
-set pgp_export_command="gpgm --no-verbose --export --armor %r"
+set pgp_export_command="gpg --no-verbose --export --armor %r"
 
 # verify a key
-set pgp_verify_key_command="gpgm --no-verbose --batch --fingerprint --check-sigs"
+set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs"
 
 # read in the public key ring
-set pgp_list_pubring_command="gpgm --no-verbose --batch --with-colons --list-keys %r" 
+set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r" 
 
 # read in the secret key ring
-set pgp_list_secring_command="gpgm --no-verbose --batch --with-colons --list-secret-keys %r" 
+set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r"