Changeset 5286:fce40f3a1aec for doc

Timestamp:

2007-11-07 03:03:32 (13 months ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

Try to fix parallel build problems by moving makedoc to doc/.
This also requires to move Muttrc into doc/.

Location:

doc

Files:

• Makefile.am (modified) (10 diffs)
• Muttrc.head (moved) (moved from Muttrc.head)
• makedoc-defs.h (moved) (moved from makedoc-defs.h)
• makedoc.c (moved) (moved from makedoc.c)

doc/Makefile.am

@@ -7 +7 @@
 
 MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C
+
+noinst_PROGRAMS = makedoc
 
 EXTRA_DIST = dotlock.man                \
@@ -24 +26 @@
         patch-notes.txt                 \
         smime-notes.txt                 \
+        Muttrc Muttrc.head stamp-doc-rc \
+        makedoc.c makedoc-defs.h        \
         html.xsl chunk.xsl $(BUILT_DISTFILES)
 
@@ -39 +43 @@
         README NEWS TODO README.SECURITY README.SSL 
 
-all:
-        $(MAKE) makedoc-all
+all: makedoc-all
 
 makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
@@ -47 +50 @@
         $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
         $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
+        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
         ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
         ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
@@ -66 +70 @@
                 $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
         done
+        $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+        -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
+                mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
+        elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
+                mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
+        elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
+                $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
+        fi
 
 uninstall-local:
@@ -79 +91 @@
         done
         -rm -f $(DESTDIR)$(docdir)/manual.txt
+        for i in Muttrc ; do \
+          if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i ; then \
+                rm $(DESTDIR)$(sysconfdir)/$$i ; \
+          fi ; \
+          rm $(DESTDIR)$(sysconfdir)/$${i}.dist ; \
+        done
 
 check:
@@ -85 +103 @@
         w3m -dump $^ > $@ || \
         elinks -dump -no-numbering -no-references $^ > $@
+
+Muttrc: stamp-doc-rc
+
+stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head
+        -rm -f Muttrc stamp-doc-rc
+        sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc
+        $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
+          $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc
+        touch stamp-doc-rc
 
 manual.html: $(srcdir)/html.xsl stamp-doc-xml
@@ -110 +137 @@
         rm -f *.aux *.log *.tex *.out
 
-DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html instdoc
+DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \
+               instdoc Muttrc
 
 instdoc: instdoc.sh
@@ -116 +144 @@
         chmod a+x instdoc
 
-../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
-        (cd .. && $(MAKE) makedoc$(EXEEXT))
+update-doc: stamp-doc-xml stamp-doc-chunked stamp-doc-rc manual.txt manual.html
 
-update-doc: stamp-doc-xml stamp-doc-chunked manual.txt manual.html
-
-muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
-        $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m |       \
+muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
+        $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -m |       \
                 cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\
                 > muttrc.man
@@ -133 +158 @@
         $(EDIT) $(srcdir)/mutt.man > $@
 
-stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
+stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
-        $(MAKE) ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds
         ( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \
           sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \
-          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s && \
+          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -s && \
           $(MAKEDOC_CPP) $(top_srcdir)/functions.h | \
             perl $(srcdir)/gen-map-doc $(srcdir)/manual.xml.tail $(top_srcdir)/OPS* \