From cb90b96c16dd5f9f9aaf3b5910aab03a8d79a359 Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Wed, 1 Sep 1999 21:41:15 +0000 Subject: [PATCH] A couple of build process and portability fixes concerning the automatically generated documentation. --- Makefile.am | 6 ++++-- doc/Makefile.in | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 14a326c3..c6dce388 100644 --- 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 b2fbe8ca..c0f2cb96 100644 --- 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 -- 2.40.0