X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=doc%2FMakefile.in;h=71dc46f2a90f9410d42d2227940879974b87afb9;hb=a8477ebaa09990b3688164cbe5cf661c4189541d;hp=8fbae03adc002f27fb9b3a3990ddbe588d0207de;hpb=e6737dc67953504df4a3f1e82849ef092a337b99;p=apps%2Fmadmutt.git

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8fbae03..71dc46f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,5 +1,3 @@
-# $Id: Makefile.in,v 3.7 2005/03/16 07:01:59 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@
@@ -61,10 +60,9 @@ 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$(EXEEXT)
 	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
@@ -75,21 +73,21 @@ try-txt: ../makedoc$(EXEEXT)
 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.gz
-	echo ".so $(mandir)/man1/muttng-flea.1" > $(DESTDIR)$(mandir)/man1/fleang.1.gz
+	echo ".so $(mandir)/man1/muttng-flea.1" > $(DESTDIR)$(mandir)/man1/muttngbug.1
+	echo ".so $(mandir)/man1/muttng-flea.1" > $(DESTDIR)$(mandir)/man1/fleang.1
 	./instdoc $(srcdir)/dotlock.man \
 		$(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) ; \
-	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,10 +95,20 @@ 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
@@ -149,11 +157,15 @@ dist distdir: Makefile $(DISTFILES)
 ../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'
+
+muttng.1: $(srcdir)/mutt.man
+	$(EDIT) $< > $@
+
 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\
@@ -161,7 +173,7 @@ muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.he
 	touch stamp-doc-man
 
 manual.sgml stamp-doc-sgml: ../makedoc$(EXEEXT) $(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 ;\
+	( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION`/" $(srcdir)/manual.sgml.head ;\
 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
 		cat - $(srcdir)/manual.sgml.tail > manual.sgml
 	touch stamp-doc-sgml