A couple of build process and portability fixes concerning the

automatically generated documentation.

diff --git a/Makefile.am b/Makefile.am
index 14a326c361d56e19802674b7ff6db785d2d6a6ed..c6dce388319d8671ae25c529a27a8ab3ce2c636d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,8 @@ mutt_SOURCES = $(BUILT_SOURCES) \
 mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(GSSLIBS) $(INTLLIBS) 
 mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) $(INTLDEPS)
 
+CPP=@CPP@
+
 DEFS=-DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
 INCLUDES=-I. -I$(includedir)
@@ -62,7 +64,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO configure acconfig.h attach.h \
        sort.h mime.types VERSION prepare _regex.h OPS.MIX      \
        README.SECURITY remailer.c remailer.h browser.h \
        lib.h extlib.c pgpewrap pgplib.h Muttrc.head Muttrc \
-       makedoc.c
+       makedoc.c stamp-doc-rc
 
 
 mutt_dotlock_SOURCES = mutt_dotlock.c
@@ -198,7 +200,7 @@ update-doc: stamp-doc-rc
 Muttrc: stamp-doc-rc
 
 stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head
-       cpp $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
+       $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
                -include config.h $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - \
                > Muttrc
        touch stamp-doc-rc

diff --git a/doc/Makefile.in b/doc/Makefile.in
index b2fbe8ca5ec5e7d51a8c1a9b78c2575b2509868f..c0f2cb96b7d682c444003a6092693108b44cbefa 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -21,6 +21,7 @@ VPATH=@srcdir@
 
 INSTALL=@INSTALL@
 CC=@CC@
+CPP=@CPP@
 XCPPFLAGS=-I. @CPPFLAGS@
 CFLAGS=@CFLAGS@ -DSHAREDIR=\"$(sharedir)\" $(XCPPFLAGS)
 LDFLAGS=@LDFLAGS@
@@ -32,7 +33,7 @@ DEFS=-DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
 INCLUDES=-I. -I$(includedir) -I$(top_srcdir)
 
-MAKEDOC_CPP=cpp $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C -include ../config.h
+MAKEDOC_CPP=$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C -include ../config.h
 
 DISTFILES = Makefile.in dotlock.man    \
        mutt.man                        \
@@ -46,7 +47,9 @@ DISTFILES = Makefile.in dotlock.man   \
        manual.sgml.head                \
        manual.sgml.tail                \
        manual.sgml                     \
-       manual.html
+       manual.html                     \
+       stamp-doc-sgml                  \
+       stamp-doc-man
 
 srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt   \
        devel-notes.txt