build: move smime_keys into contrib

diff --git a/.gitignore b/.gitignore
index ba9f6061ab98fb6a430d33627135b45f3aeefd8a..9c95d5a039c2f1a033e301c1dbdc6056d0d42fa3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ mutt
 mutt_md5
 pgpewrap
 pgpring
-smime_keys
 txt2c
 
 # ./configure

diff --git a/Makefile.am b/Makefile.am
index 66f303368495b8607e5670396831c678dd74de63..43d9ff2b188c233d3efc9f1edf9903438ab85d69 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,10 +79,10 @@ EXTRA_DIST = account.h ascii.h attach.h bcache.h browser.h buffer.h buffy.h \
        OPS.CRYPT OPS.MIX OPS.NOTMUCH OPS.PGP OPS.SIDEBAR OPS.SMIME pager.h \
        pgpewrap.c pop.h protos.h README.md README.SSL remailer.c remailer.h \
        rfc1524.h rfc2047.h rfc2231.h rfc3676.h rfc822.h sha1.h sidebar.h \
-       smime_keys.pl sort.h txt2c.c txt2c.sh version.h \
+       sort.h txt2c.c txt2c.sh version.h \
        keymap_alldefs.h
 
-EXTRA_SCRIPTS = smime_keys
+EXTRA_SCRIPTS =
 
 pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgppubring.c sha1.c
 pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS)
@@ -113,7 +113,7 @@ conststrings.c: txt2c config.status
 
 CLEANFILES = keymap_alldefs.h $(BUILT_SOURCES)
 
-DISTCLEANFILES= smime_keys txt2c
+DISTCLEANFILES= txt2c
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -122,10 +122,6 @@ LDADD = $(LIBOBJS) $(INTLLIBS)
 dist-hook:
        echo $(VERSION) > $(distdir)/.tarball-version
 
-smime_keys: $(srcdir)/smime_keys.pl
-       cp $(srcdir)/smime_keys.pl smime_keys
-       chmod +x smime_keys
-
 keymap_defs.h: $(OPS) $(srcdir)/gen_defs
        $(srcdir)/gen_defs $(OPS) > $@
 

diff --git a/configure.ac b/configure.ac
index 5cd7944e97e539f7271439b537af27427454b865..c3866a3d61587f8a6a95ae72dfb75d6c9834f638 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@ AS_IF([test x$use_pgp != "xno"], [
 dnl --enable-smime
 AS_IF([test x$use_smime != "xno"], [
        AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME, 1, [Define if you want classic S/MIME support.])
-       SMIMEAUX_TARGET="smime_keys"
+       SMIMEAUX_TARGET='$(top_srcdir)/contrib/smime_keys'
        build_ncrypt_smime="yes"
 ])
 

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index eb4bca4f3bfbef91f8a3dd5c4ce7e8fdb37f7afe..a160dbfb1b2966c6e6b636b932667788fbabc2ec 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -15,7 +15,8 @@ EXTRA_DIST = language.txt language50.txt  \
        lua \
        hcache-bench \
        logo \
-       colorschemes
+       colorschemes \
+       smime_keys
 
 CONTRIB_DIRS = vim-keys keybase lua hcache-bench logo colorschemes
 

diff --git a/smime_keys.pl b/contrib/smime_keys
similarity index 100%
rename from smime_keys.pl
rename to contrib/smime_keys

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index e9056fb1580d97eed19d8d2cbb936c4424695a4d..a30584dbfa5d50f9220b21cb89ecc773e413c40f 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -479,7 +479,7 @@ static struct SmimeKey *smime_parse_key(char *buf)
   {
     /* Some users manually maintain their .index file, and use a tab
      * as a delimiter, which the old parsing code (using fscanf)
-     * happened to allow.  smime_keys.pl uses a space, so search for both.
+     * happened to allow.  smime_keys uses a space, so search for both.
      */
     if ((pend = strchr(p, ' ')) || (pend = strchr(p, '\t')) || (pend = strchr(p, '\n')))
       *pend++ = 0;