move helper programs to lib dir

Programs:
    lib/neomutt/pgpewrap
    lib/neomutt/pgpring
    lib/neomutt/smime_keys

diff --git a/Makefile.am b/Makefile.am
index 30f880c80e65347f0cbfe933a038f5daadfbdd57..79f283bd9f9b32273562e756bbe70bfd6fb8275a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,13 +36,11 @@ if BUILD_PO
 SUBDIRS += po
 endif
 
-bin_SCRIPTS = $(SMIMEAUX_TARGET)
-
 distdir = $(PACKAGE)-$(VERSION)
 
 BUILT_SOURCES = conststrings.c git_ver.h
 
-bin_PROGRAMS = neomutt $(PGPAUX_TARGET)
+bin_PROGRAMS = neomutt
 
 neomutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
        bcache.c body.c body.h browser.c buffy.c charset.c color.c \
@@ -103,7 +101,7 @@ pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) $(LIBMUTTDEPS)
 txt2c_SOURCES = txt2c.c
 txt2c_LDADD =
 
-noinst_PROGRAMS = txt2c
+noinst_PROGRAMS = txt2c $(SMIMEAUX_TARGET) $(PGPAUX_TARGET)
 
 conststrings.c: txt2c config.status
        ( \
@@ -142,6 +140,18 @@ install-data-local:
        -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
                $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
        fi
+       -if test -n "$(SMIMEAUX_TARGET)"; then \
+               $(MKDIR_P) $(DESTDIR)$(libdir)/$(PACKAGE); \
+               for i in $(SMIMEAUX_TARGET); do \
+                       $(INSTALL) -m 755 $(srcdir)/$$i $(DESTDIR)$(libdir)/$(PACKAGE); \
+               done \
+       fi
+       -if test -n "$(PGPAUX_TARGET)"; then \
+               $(MKDIR_P) $(DESTDIR)$(libdir)/$(PACKAGE); \
+               for i in $(PGPAUX_TARGET); do \
+                       $(INSTALL) -m 755 $$i $(DESTDIR)$(libdir)/$(PACKAGE); \
+               done \
+       fi
 
 uninstall-local:
        for i in mime.types; do \

diff --git a/contrib/gpg.rc b/contrib/gpg.rc
index 3392038bf091d0aa0223270a19c5b680c221e051..5cb33ff03a59beda2c8580329fa3267103c322d2 100644 (file)
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
@@ -46,12 +46,12 @@ set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphra
 set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
 
 # create a pgp/mime encrypted attachment
-# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+# set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
 
 # create a pgp/mime encrypted and signed attachment
-# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+# set pgp_encrypt_sign_command="/usr/lib/neomutt/pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="/usr/lib/neomutt/pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
 
 # import a key into the public key ring
 set pgp_import_command="gpg --no-verbose --import %f"

diff --git a/contrib/pgp5.rc b/contrib/pgp5.rc
index 4440d6b779240a3a6214ab9cc549f621f5d13c1c..2f5d723f433fc63b9368cb08ff23be0bdee1050d 100644 (file)
--- a/contrib/pgp5.rc
+++ b/contrib/pgp5.rc
@@ -19,10 +19,10 @@ set pgp_decrypt_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgpv +languag
 set pgp_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgps +language=mutt +verbose=0 +batchmode -abft %?a? -u %a?"
 
 # create a pgp/mime encrypted attachment
-set pgp_encrypt_only_command="pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -aft -- -r %r < %f"
+set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -aft -- -r %r < %f"
 
 # create a pgp/mime encrypted and signed attachment
-set pgp_encrypt_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -afts %?a? -u %a? -- -r %r"
+set pgp_encrypt_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | /usr/lib/neomutt/pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -afts %?a? -u %a? -- -r %r"
 
 # import a key into the public key ring
 set pgp_import_command="pgpk -a +language=mutt --OutputInformationFD=1 %f"

diff --git a/contrib/smime.rc b/contrib/smime.rc
index 532ac9ec004a11827cf7044c9cf29bbae4112369..a58833df224f537fb54e0a5be21327ce37e527a8 100644 (file)
--- a/contrib/smime.rc
+++ b/contrib/smime.rc
@@ -52,7 +52,7 @@ set smime_get_signer_cert_command="openssl smime -verify -in %f -noverify -signe
 set smime_get_cert_email_command="openssl x509 -in %f -noout -email"
 
 # Add a certificate to the database using smime_keys.
-set smime_import_cert_command="smime_keys add_cert %f"
+set smime_import_cert_command="/usr/lib/neomutt/smime_keys add_cert %f"