From: Julien Danjou Date: Tue, 7 Nov 2006 17:31:02 +0000 (+0100) Subject: Change generated files to madmutt X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=ab4e61871dafd1556fcbff220f01efd817beb3d0 Change generated files to madmutt This files change the binary executable file name from muttng to madmutt and others things Signed-off-by: Julien Danjou Signed-off-by: Pierre Habouzit --- diff --git a/Muttngrc.head.in b/Madmuttrc.head.in similarity index 100% rename from Muttngrc.head.in rename to Madmuttrc.head.in diff --git a/Makefile.am b/Makefile.am index f07b281..7a71e98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ## Use aclocal -I m4; automake --foreign AUTOMAKE_OPTIONS = foreign -EXTRA_PROGRAMS = muttng_dotlock pgpringng pgpewrapng makedoc +EXTRA_PROGRAMS = madmutt_dotlock pgpringng pgpewrapng makedoc if BUILD_NNTP NNTP_SUBDIR = nntp @@ -13,12 +13,12 @@ SUBDIRS = intl m4 po doc contrib \ lib-lib lib-mime lib-crypt lib-hash lib \ pop imap $(NNTP_SUBDIR) -bin_SCRIPTS = muttngbug fleang +bin_SCRIPTS = madmuttbug fleang BUILT_SOURCES = keymap_defs.h version.h -bin_PROGRAMS = muttng muttng_dotlock pgpringng pgpewrapng smime_keysng -muttng_SOURCES = $(BUILT_SOURCES) \ +bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng +madmutt_SOURCES = $(BUILT_SOURCES) \ alias.c attach.c base64.c browser.c buffy.c \ charset.c color.c compress.c commands.c complete.c \ compose.c copy.c curs_lib.c curs_main.c \ @@ -33,12 +33,12 @@ muttng_SOURCES = $(BUILT_SOURCES) \ thread.c url.c utf8.c wcwidth.c \ account.c mutt_socket.c mutt_tunnel.c -muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \ +madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \ -Limap -limap -Lpop -lpop $(LIBNNTP) \ -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-hash -lhash \ -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV) -muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \ +madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \ $(top_builddir)/lib-lib/liblib.a \ $(top_builddir)/lib-mime/libmime.a \ $(top_builddir)/lib-crypt/libcrypt.a \ @@ -63,7 +63,7 @@ INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(LIBGPGME_CFLAGS CPPFLAGS=@CPPFLAGS@ -I$(includedir) -EXTRA_muttng_SOURCES = \ +EXTRA_madmutt_SOURCES = \ account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \ mutt_tunnel.c resize.c dotlock.c remailer.c \ alias.h browser.h enter.h \ @@ -82,15 +82,15 @@ EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ mbox.h mh.h mx.h pager.h protos.h rfc1524.h \ rfc3676.h sort.h mime.types autogen.sh \ _regex.h OPS.MIX remailer.c remailer.h browser.h state.h \ - mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \ + mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h madmuttrc.head madmuttrc \ makedoc.c stamp-doc-rc README.SSL smime.h\ - muttngbug pgppacket.h depcomp BEWARE \ + madmuttbug pgppacket.h depcomp BEWARE \ mkchangelog.sh cvslog2changelog.pl mutt_idna.h \ regex.c mutt_libesmtp.h crypt-gpgme.h -muttng_dotlock_SOURCES = dotlock.c -muttng_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@ -muttng_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a +madmutt_dotlock_SOURCES = dotlock.c +madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@ +madmutt_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a pgpringng_SOURCES = pgppubring.c lib.c extlib.c pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \ @@ -134,27 +134,27 @@ version.h: echo "#define MUTT_REVISION \"git\"" > version.h install-exec-hook: - if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/muttng_dotlock ; then \ + if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/madmutt_dotlock ; then \ rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ - ln -sf $(DESTDIR)$(bindir)/muttng_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ + ln -sf $(DESTDIR)$(bindir)/madmutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ fi - if test -f $(DESTDIR)$(bindir)/muttng_dotlock && test x@DOTLOCK_GROUP@ != x ; then \ - chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/muttng_dotlock && \ - chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/muttng_dotlock || \ - { echo "Can't fix muttng_dotlock's permissions!" >&2 ; } \ + if test -f $(DESTDIR)$(bindir)/madmutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \ + chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/madmutt_dotlock && \ + chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/madmutt_dotlock || \ + { echo "Can't fix madmutt_dotlock's permissions!" >&2 ; } \ fi -install-data-local: Muttngrc +install-data-local: madmuttrc $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) - -if [ -f $(DESTDIR)$(pkgdatadir)/Muttngrc ] ; then \ - mv $(DESTDIR)$(pkgdatadir)/Muttngrc* $(DESTDIR)$(sysconfdir) ; \ - elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttngrc ] ; then \ - mv $(DESTDIR)$(pkgdatadir)/../Muttngrc* $(DESTDIR)$(sysconfdir) ; \ - elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \ - $(INSTALL) -m 644 Muttngrc $(DESTDIR)$(sysconfdir) ; \ + -if [ -f $(DESTDIR)$(pkgdatadir)/madmuttrc ] ; then \ + mv $(DESTDIR)$(pkgdatadir)/madmuttrc* $(DESTDIR)$(sysconfdir) ; \ + elif [ -f $(DESTDIR)$(pkgdatadir)/../madmuttrc ] ; then \ + mv $(DESTDIR)$(pkgdatadir)/../madmuttrc* $(DESTDIR)$(sysconfdir) ; \ + elif [ ! -f $(DESTDIR)$(sysconfdir)/madmuttrc ] ; then \ + $(INSTALL) -m 644 madmuttrc $(DESTDIR)$(sysconfdir) ; \ fi - -if [ ! -f $(DESTDIR)$(sysconfdir)/muttng-mime.types ]; then \ - $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/muttng-mime.types; \ + -if [ ! -f $(DESTDIR)$(sysconfdir)/madmutt-mime.types ]; then \ + $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/madmutt-mime.types; \ fi @@ -169,12 +169,12 @@ mutt-dist: update-doc: stamp-doc-rc (cd doc && $(MAKE) update-doc) -Muttngrc: stamp-doc-rc +madmuttrc: stamp-doc-rc -stamp-doc-rc: $(srcdir)/init.h makedoc Muttngrc.head - -rm -f Muttngrc stamp-doc-rc +stamp-doc-rc: $(srcdir)/init.h makedoc madmuttrc.head + -rm -f madmuttrc stamp-doc-rc $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \ - $(srcdir)/init.h | ./makedoc -c | cat Muttngrc.head - > Muttngrc + $(srcdir)/init.h | ./makedoc -c | cat madmuttrc.head - > madmuttrc touch stamp-doc-rc diff --git a/configure.ac b/configure.ac index fe2894f..69a09ca 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AM_CONFIG_HEADER(config.h) mutt_cv_version=`cat "$srcdir/VERSION.in"` -AM_INIT_AUTOMAKE(muttng, $mutt_cv_version) +AM_INIT_AUTOMAKE(madmutt, $mutt_cv_version) AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in']) AC_GNU_SOURCE @@ -1006,5 +1006,5 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile imap/Makefile pop/Makefile nntp/Makefile - Muttngrc.head + Madmuttrc.head doc/instdoc.sh) diff --git a/muttngbug b/madmuttbug similarity index 100% rename from muttngbug rename to madmuttbug diff --git a/po/muttng.pot b/po/madmutt.pot similarity index 100% rename from po/muttng.pot rename to po/madmutt.pot