fix AC_INIT tarname parameter

By specifying 'neomutt' as the tarname, the docs and translations were
being installed in wrong places.

Note: distdir is overridden in Makefile.am so that we still get a
neomutt tarfile on "make dist".

diff --git a/.gitignore b/.gitignore
index ca8c3b6e501721b72d6e127f82324cd68d34bf86..7d33fa4172cc6d6ec234d6a917b3a9e9f8ad2648 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,7 @@ doc/stamp-doc-xml
 doc/neomutt-syntax.vim
 
 po/POTFILES
-po/neomutt.pot
+po/mutt.pot
 
 .version
 aclocal.m4

diff --git a/Makefile.am b/Makefile.am
index c35518729db74b274b6b6ca49c8d5da2fe01f7da..d68b9a2d4d6f664fdfd56700b7a3d60c8927a346 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,8 @@ if BUILD_HCACHE
 HCVERSION = hcversion.h
 endif
 
+distdir = neo$(PACKAGE)-$(VERSION)
+
 BUILT_SOURCES = keymap_defs.h patchlist.c oldmutt_ver.h conststrings.c hcachever.sh $(HCVERSION) $(top_srcdir)/.version
 
 bin_PROGRAMS = mutt $(DOTLOCK_TARGET) $(PGPAUX_TARGET)

diff --git a/configure.ac b/configure.ac
index 17273425c61417856ea2e254db6297a8a473aec9..097f928093b3397b44952a39c2ecb51ed0963ea5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl !!! TO DUMP THEIR RESULTS WHEN MUTT -V IS CALLED            !!!
 CFLAGS=$CFLAGS
 LDFLAGS=$LDFLAGS
 
-AC_INIT([NeoMutt], [20160910], [neomutt-devel@neomutt.org], [neomutt], [http://www.neomutt.org])
+AC_INIT([NeoMutt], [20160910], [neomutt-devel@neomutt.org], [mutt], [http://www.neomutt.org])
 AC_CONFIG_SRCDIR(mutt.h)
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])