From d5b8e82ca172f13bcb966dff6583f67d6ea41c7b Mon Sep 17 00:00:00 2001 From: ak1 Date: Mon, 24 Jan 2005 20:06:12 +0000 Subject: [PATCH] Andreas Krennmair: fixed installation process for Muttngrc. git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@31 e385b8ad-14ed-0310-8656-cc95a2468c6d --- Makefile.am | 10 +++++----- Makefile.in | 16 ++++++++-------- Muttrc.head.in => Muttngrc.head.in | 0 configure | 4 ++-- configure.in | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) rename Muttrc.head.in => Muttngrc.head.in (100%) diff --git a/Makefile.am b/Makefile.am index f8ba459..a1172fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,7 +76,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare \ nntp.h ChangeLog.nntp \ _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \ - mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttrc.head Muttrc \ + mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \ makedoc.c stamp-doc-rc README.SSL smime.h\ muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \ @@ -186,12 +186,12 @@ mutt-dist: update-doc: stamp-doc-rc (cd doc && $(MAKE) update-doc) -Muttrc: stamp-doc-rc +Muttngrc: stamp-doc-rc -stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head - -rm -f Muttrc stamp-doc-rc +stamp-doc-rc: $(srcdir)/init.h makedoc Muttngrc.head + -rm -f Muttngrc stamp-doc-rc $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \ - $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc + $(srcdir)/init.h | ./makedoc -c | cat Muttngrc.head - > Muttngrc touch stamp-doc-rc diff --git a/Makefile.in b/Makefile.in index 0737710..c0c684b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -245,7 +245,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare \ nntp.h ChangeLog.nntp \ _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \ - mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttrc.head Muttrc \ + mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \ makedoc.c stamp-doc-rc README.SSL smime.h\ muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \ @@ -272,7 +272,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = intl/Makefile doc/Makefile contrib/Makefile \ - muttbug.sh Muttrc.head doc/instdoc.sh + muttbug.sh Muttngrc.head doc/instdoc.sh EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) makedoc$(EXEEXT) bin_PROGRAMS = muttng$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ \ @SMIMEAUX_TARGET@ @@ -333,7 +333,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive DIST_COMMON = README ABOUT-NLS ChangeLog INSTALL Makefile.am \ - Makefile.in Muttrc.head.in NEWS TODO acconfig.h aclocal.m4 \ + Makefile.in Muttngrc.head.in NEWS TODO acconfig.h aclocal.m4 \ config.guess config.h.in config.sub configure configure.in \ depcomp install-sh missing mkinstalldirs muttbug.sh.in regex.c \ snprintf.c strcasecmp.c strdup.c @@ -384,7 +384,7 @@ contrib/Makefile: $(top_builddir)/config.status $(top_srcdir)/contrib/Makefile.i cd $(top_builddir) && $(SHELL) ./config.status $@ muttbug.sh: $(top_builddir)/config.status muttbug.sh.in cd $(top_builddir) && $(SHELL) ./config.status $@ -Muttrc.head: $(top_builddir)/config.status Muttrc.head.in +Muttngrc.head: $(top_builddir)/config.status Muttngrc.head.in cd $(top_builddir) && $(SHELL) ./config.status $@ doc/instdoc.sh: $(top_builddir)/config.status $(top_srcdir)/doc/instdoc.sh.in cd $(top_builddir) && $(SHELL) ./config.status $@ @@ -903,12 +903,12 @@ mutt-dist: update-doc: stamp-doc-rc (cd doc && $(MAKE) update-doc) -Muttrc: stamp-doc-rc +Muttngrc: stamp-doc-rc -stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head - -rm -f Muttrc stamp-doc-rc +stamp-doc-rc: $(srcdir)/init.h makedoc Muttngrc.head + -rm -f Muttngrc stamp-doc-rc $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \ - $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc + $(srcdir)/init.h | ./makedoc -c | cat Muttngrc.head - > Muttngrc touch stamp-doc-rc .PHONY: commit pclean check-security commit-real commit-changelog diff --git a/Muttrc.head.in b/Muttngrc.head.in similarity index 100% rename from Muttrc.head.in rename to Muttngrc.head.in diff --git a/configure b/configure index 26d66d8..ce066f0 100755 --- a/configure +++ b/configure @@ -15603,7 +15603,7 @@ _ACEOF fi - ac_config_files="$ac_config_files Makefile intl/Makefile m4/Makefile po/Makefile.in doc/Makefile contrib/Makefile muttbug.sh imap/Makefile Muttrc.head doc/instdoc.sh" + ac_config_files="$ac_config_files Makefile intl/Makefile m4/Makefile po/Makefile.in doc/Makefile contrib/Makefile muttbug.sh imap/Makefile Muttngrc.head doc/instdoc.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -16203,7 +16203,7 @@ do "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; "muttbug.sh" ) CONFIG_FILES="$CONFIG_FILES muttbug.sh" ;; "imap/Makefile" ) CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;; - "Muttrc.head" ) CONFIG_FILES="$CONFIG_FILES Muttrc.head" ;; + "Muttngrc.head" ) CONFIG_FILES="$CONFIG_FILES Muttngrc.head" ;; "doc/instdoc.sh" ) CONFIG_FILES="$CONFIG_FILES doc/instdoc.sh" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; diff --git a/configure.in b/configure.in index 25c4409..aa87111 100644 --- a/configure.in +++ b/configure.in @@ -1116,5 +1116,5 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile po/Makefile.in doc/Makefile contrib/Makefile muttbug.sh imap/Makefile - Muttrc.head + Muttngrc.head doc/instdoc.sh) -- 2.20.1