Fixups for nxml per Romain Francoise email.

5 files changed, 32 insertions, 4 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 18e4686c43..bcf97b80ba 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-23  Mark A. Hershberger  <mah@everybody.org>
+
+	* nxml-mode.texi: Move to ../misc.
+
 2007-11-23  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
 	* files.texi (Why Version Control?): Fix typo.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d1f74ca756..24dbe68d4e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-23  Mark A. Hershberger  <mah@everybody.org>
+
+	* Makefile.in (INFO_TARGETS, DVI_TARGETS): Add nxml-mode.
+	($(infodir)/nxml-mode): New rule.
+
+	* makefile.w32-in (INFO_TARGETS, DVI_TARGETS): Add nxml-mode.
+	($(infodir)/nxml-mode): New rule.
+	(clean): Add nxml-mode*.
+
+	* nxml-mode.texi: New file with nxml manual.
+
 2007-11-18  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi (Filename completion): Simplify explanation of
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 93982f419d..2e3bfad082 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -60,6 +60,7 @@ INFO_TARGETS = \
 	$(infodir)/message \
 	$(infodir)/mh-e \
 	$(infodir)/newsticker \
+	$(infodir)/nxml-mode \
 	$(infodir)/org \
 	$(infodir)/pcl-cvs \
 	$(infodir)/pgg \
@@ -100,6 +101,7 @@ DVI_TARGETS = \
 	message.dvi \
 	mh-e.dvi \
 	newsticker.dvi \
+	nxml-mode.dvi \
 	org.dvi \
 	pcl-cvs.dvi \
 	pgg.dvi \
@@ -278,6 +280,12 @@ $(infodir)/newsticker: newsticker.texi
 newsticker.dvi: newsticker.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
 
+nxml-mode : $(infodir)/nxml-mode
+$(infodir)/nxml-mode: nxml-mode.texi
+	cd $(srcdir); $(MAKEINFO) nxml-mode.texi
+nxml-mode.dvi: nxml-mode.texi
+	$(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
+
 org : $(infodir)/org
 $(infodir)/org: org.texi
 	cd $(srcdir); $(MAKEINFO) org.texi
diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 4d8d44765d..d626ef2fe9 100644
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -43,7 +43,7 @@ INFO_TARGETS = $(infodir)/ccmode \
 		$(infodir)/url $(infodir)/speedbar $(infodir)/tramp \
 		$(infodir)/ses $(infodir)/smtpmail $(infodir)/flymake \
 		$(infodir)/newsticker $(infodir)/rcirc $(infodir)/erc \
-		$(infodir)/remember
+		$(infodir)/remember $(infodir)/nxml-mode
 DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
 		 ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \
                  gnus.dvi message.dvi sieve.dvi pgg.dvi mh-e.dvi \
@@ -51,7 +51,7 @@ DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
 		 ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
 		 pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
 		 speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
-                 newsticker.dvi rcirc.dvi erc.dvi remember.dvi
+                 newsticker.dvi rcirc.dvi erc.dvi remember.dvi nxml-mode.dvi
 INFOSOURCES = info.texi
 
 # The following rule does not work with all versions of `make'.
@@ -271,6 +271,11 @@ $(infodir)/newsticker: newsticker.texi
 newsticker.dvi: newsticker.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/newsticker.texi
 
+$(infodir)/nxml-mode: nxml-mode.texi
+	$(MAKEINFO) nxml-mode.texi
+nxml-mod.dvi: nxml-mode.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/nxml-mode.texi
+
 $(infodir)/rcirc: rcirc.texi
 	$(MAKEINFO) rcirc.texi
 rcirc.dvi: rcirc.texi
@@ -304,7 +309,7 @@ clean: mostlyclean
 		 $(infodir)/flymake* $(infodir)/newsticker* \
 		 $(infodir)/sieve* $(infodir)/pgg* \
 		 $(infodir)/erc* $(infodir)/rcirc* \
-		 $(infodir)/remember*
+		 $(infodir)/remember* $(infodir)/nxml-mode*
 
 distclean: clean
 
diff --git a/doc/emacs/nxml-mode.texi b/doc/misc/nxml-mode.texi
index e2ab3fdbd5..fec3350312 100644
--- a/doc/emacs/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -1,6 +1,6 @@
 \input texinfo @c -*- texinfo -*-
 @c %**start of header
-@setfilename nxml-mode.info
+@setfilename ../../info/nxml-mode
 @settitle nXML Mode
 @c %**end of header