X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=doc%2FMakefile.in;h=e7780dd83e495aa5362a2fcdaa35efdfc90ddd14;hp=c391a464e6b92a13a3fd1ee94d0cb58b79e94280;hb=452ffdd4bbcd8f2dd9e4811c115824b556814ebb;hpb=24ecaf67a8dcf80de05f86dd8ee7b11dad0ead69

diff --git a/doc/Makefile.in b/doc/Makefile.in
index c391a46..e7780dd 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,5 +1,3 @@
-# $Id: Makefile.in,v 3.6 2005/03/16 02:49:33 brendan Exp $
-
 SHELL = /bin/sh
 
 PACKAGE = @PACKAGE@
@@ -7,6 +5,7 @@ VERSION = @VERSION@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+sysconfdir = @sysconfdir@
 bindir = @bindir@
 libdir = @libdir@
 mandir = @mandir@
@@ -29,7 +28,7 @@ subdir = doc
 
 CPPFLAGS = @CPPFLAGS@
 
-DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
+DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1 -DPKGDOCDIR=\"$(docdir)\"
 INCLUDES = -I. -I.. -I$(includedir) -I$(top_srcdir)
 
 MAKEDOC_CPP = $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 
@@ -61,21 +60,20 @@ srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt	\
 
 
 topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
-	ChangeLog.old ChangeLog.mutt-ng UPGRADING	\
-	README NEWS TODO TODO.mutt-ng README.SECURITY README.SSL 
+	UPGRADING README NEWS TODO TODO.mutt-ng README.SSL 
 
-all: muttrc.man try-html try-txt
+all: muttng.1 muttrc.man try-html try-txt
 
-try-html: ../makedoc
+try-html: ../makedoc$(EXEEXT)
 	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
 
-try-txt: ../makedoc
+try-txt: ../makedoc$(EXEEXT)
 	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
 
 install: all instdoc
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
-	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/muttng.1
+	./instdoc muttng.1 $(DESTDIR)$(mandir)/man1/muttng.1
 	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttng-flea.1
 	echo ".so $(mandir)/man1/muttng-flea.1" > $(DESTDIR)$(mandir)/man1/muttngbug.1
 	echo ".so $(mandir)/man1/muttng-flea.1" > $(DESTDIR)$(mandir)/man1/fleang.1
@@ -84,12 +82,12 @@ install: all instdoc
 	./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) ; \
-	done
 	for f in $(topsrcdir_DOCFILES) ; do \
 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
 	done
+	for f in $(srcdir_DOCFILES) ; do \
+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+	done
 	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
 	for file in manual*.html ; do	\
@@ -97,24 +95,30 @@ install: all instdoc
 	done
 
 uninstall:
-	-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)
+	for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \
+	  rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
+	done
+	for f in muttngrc.5 muttng-mbox.5  ; do \
+	  rm -f $(DESTDIR)$(mandir)/man5/$$f ; \
+	done
+	for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) ; do \
+	  rm -f $(DESTDIR)$(docdir)/$$f ; \
+	done
+	-rm -f $(DESTDIR)$(docdir)/manual.txt
+	for f in manual*.html ; do \
+	  rm -f $(DESTDIR)$(docdir)/html/$$f ; \
+	done
+	-rmdir $(DESTDIR)$(docdir)/html
 
 check:
 manual.txt: manual.sgml
-	if linuxdoc -B txt --pass='-P -c' manual ; then \
-		uniq < manual.txt | expand > _manual.txt ; \
-		rm manual.txt ; \
-		mv _manual.txt manual.txt ;\
-	fi
+	@SGML2TXT_CMD@
 
 manual.html: manual.sgml
-	sgml2html manual  || true
+	@SGML2HTML_CMD@
 
 manual.ps: manual.sgml
-	sgml2latex --output=ps manual || true
+	@SGML2PS_CMD@
 
 clean: 
 	rm -f *~ *.html *.orig *.rej  stamp-doc-sgml stamp-doc-man *.ps
@@ -150,22 +154,26 @@ dist distdir: Makefile $(DISTFILES)
 		|| cp -p $$file $(distdir) ;			\
 	done
 
-../makedoc: $(top_srcdir)/makedoc.c
+../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
 	(cd .. && $(MAKE) makedoc$(EXEEXT))
 
-# hack around autoconf mixing up patterns.
-at = @
+update-doc:  ../makedoc$(EXEEXT) stamp-doc-sgml stamp-doc-man manual.txt manual.html
+
+EDIT=sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
+     -e 's,@bindir\@,$(bindir),g' \
+     -e 's,@docdir\@,$(docdir),g'
 
-update-doc:  ../makedoc stamp-doc-sgml stamp-doc-man manual.txt manual.html
+muttng.1: $(srcdir)/mutt.man
+	$(EDIT) $(srcdir)/mutt.man > $@
 
-muttrc.man stamp-doc-man: ../makedoc $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
+muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
 	$(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | 	    \
 		cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\
 		> muttrc.man
 	touch stamp-doc-man
 
-manual.sgml stamp-doc-sgml: ../makedoc $(top_srcdir)/init.h manual.sgml.head manual.sgml.tail $(top_srcdir)/VERSION
-	( sed -e "s/$(at)VERSION$(at)/`cat $(top_srcdir)/VERSION`/" $(srcdir)/manual.sgml.head ;\
+manual.sgml stamp-doc-sgml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h manual.sgml.head manual.sgml.tail $(top_srcdir)/VERSION.in $(top_srcdir)/VERSION.svn
+	( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`-r`cat $(top_srcdir)/VERSION.svn`/" $(srcdir)/manual.sgml.head ;\
 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
 		cat - $(srcdir)/manual.sgml.tail > manual.sgml
 	touch stamp-doc-sgml