From ab6c3ae2869a332e0d911f81fbe57ae0b0722631 Mon Sep 17 00:00:00 2001
From: ak1 <ak1@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Sat, 29 Jan 2005 17:54:18 +0000
Subject: [PATCH] Andreas Krennmair: 	fix a few paths.

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@37 e385b8ad-14ed-0310-8656-cc95a2468c6d
---
 configure        |  2 +-
 configure.in     |  2 +-
 doc/Makefile.in  | 18 +++++++++---------
 imap/Makefile.in |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index ce066f0..8969efc 100755
--- a/configure
+++ b/configure
@@ -9559,7 +9559,7 @@ if test "${with_docdir+set}" = set; then
   withval="$with_docdir"
   mutt_cv_docdir=$withval
 else
-  mutt_cv_docdir="$mutt_cv_prefix/doc/mutt"
+  mutt_cv_docdir="$mutt_cv_prefix/doc/muttng"
 fi;
 echo "$as_me:$LINENO: result: $mutt_cv_docdir" >&5
 echo "${ECHO_T}$mutt_cv_docdir" >&6
diff --git a/configure.in b/configure.in
index aa87111..7a4d72d 100644
--- a/configure.in
+++ b/configure.in
@@ -464,7 +464,7 @@ AC_SUBST(DOTLOCK_TARGET)
 AC_MSG_CHECKING(where to put the documentation)
 AC_ARG_WITH(docdir, [  --with-docdir=PATH         Specify where to put the documentation],
         [mutt_cv_docdir=$withval],
-        [mutt_cv_docdir="$mutt_cv_prefix/doc/mutt"])
+        [mutt_cv_docdir="$mutt_cv_prefix/doc/muttng"])
 AC_MSG_RESULT($mutt_cv_docdir)
 
 docdir=$mutt_cv_docdir
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 09165a2..9f85854 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -73,13 +73,13 @@ try-txt: ../makedoc
 install: all instdoc
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
-	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
-	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
-	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
+	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/muttng.1
+	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttng-flea.1
+	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttngbug.1
 	./instdoc $(srcdir)/dotlock.man \
-		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
-	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
-	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
+		$(DESTDIR)$(mandir)/man1/muttng_dotlock.1
+	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttngrc.5
+	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/muttng-mbox.5
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
 	for f in $(srcdir_DOCFILES) ; do \
 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
@@ -94,9 +94,9 @@ install: all instdoc
 	done
 
 uninstall:
-	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-	-rm -f $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
-	-rm -f $(DESTDIR)$(mandir)/man5/muttrc.5
+	-rm -f $(DESTDIR)$(mandir)/man1/muttng.1
+	-rm -f $(DESTDIR)$(mandir)/man1/muttng_dotlock.1
+	-rm -f $(DESTDIR)$(mandir)/man5/muttngrc.5
 	-rm -rf $(DESTDIR)$(docdir)
 
 check:
diff --git a/imap/Makefile.in b/imap/Makefile.in
index cabfb98..b3a1497 100644
--- a/imap/Makefile.in
+++ b/imap/Makefile.in
@@ -174,9 +174,9 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
 
 @USE_GSS_TRUE@GSSSOURCES = auth_gss.c
+@USE_SASL_FALSE@AUTHENTICATORS = auth_anon.c auth_cram.c
 
 @USE_SASL_TRUE@AUTHENTICATORS = auth_sasl.c
-@USE_SASL_FALSE@AUTHENTICATORS = auth_anon.c auth_cram.c
 
 EXTRA_DIST = BUGS README TODO auth_anon.c auth_cram.c auth_gss.c auth_sasl.c
 
@@ -198,8 +198,8 @@ LIBRARIES = $(noinst_LIBRARIES)
 libimap_a_AR = $(AR) cru
 libimap_a_LIBADD =
 am__libimap_a_SOURCES_DIST = auth.c auth_login.c browse.c command.c \
-	imap.c imap.h message.c utf7.c util.c auth_sasl.c auth_anon.c \
-	auth_cram.c auth_gss.c
+	imap.c imap.h message.c utf7.c util.c auth_anon.c auth_cram.c \
+	auth_sasl.c auth_gss.c
 @USE_SASL_TRUE@am__objects_1 = auth_sasl.$(OBJEXT)
 @USE_SASL_FALSE@am__objects_1 = auth_anon.$(OBJEXT) auth_cram.$(OBJEXT)
 @USE_GSS_TRUE@am__objects_2 = auth_gss.$(OBJEXT)
-- 
2.20.1