4 files changed, 25 insertions, 1 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 981522d996b..3306e285450 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-19  Andreas Schwab  <schwab@suse.de>
+
+        * ns-emacs.texi: Move to ../misc.
+
 2008-07-15  Chong Yidong  <cyd@stupidchicken.com>
 
         * entering.texi (Exiting): Don't describe text-only terminals as the
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6df3f5b19a6..9385d494392 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-19  Andreas Schwab  <schwab@suse.de>
+
+        * ns-emacs.texi: Moved from ../emacs.  Add @direntry. 
+
+        * Makefile.in (INFO_TARGETS, DVI_TARGETS): Add ns-emacs.
+        (ns-emacs, $(infodir)/ns-emacs, ns-emacs.dvi): New rules.
+
 2008-07-18  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbus.texi (Inspection): Rework, introduce submenus.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 24deea88f32..ab357fc31dc 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)/ns-emacs \
         $(infodir)/nxml-mode \
         $(infodir)/org \
         $(infodir)/pcl-cvs \
@@ -104,6 +105,7 @@ DVI_TARGETS = \
         message.dvi \
         mh-e.dvi \
         newsticker.dvi \
+        ns-emacs.dvi \
         nxml-mode.dvi \
         org.dvi \
         pcl-cvs.dvi \
@@ -296,6 +298,12 @@ $(infodir)/newsticker: newsticker.texi
 newsticker.dvi: newsticker.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
 
+ns-emacs : $(infodir)/ns-emacs
+$(infodir)/ns-emacs: ns-emacs.texi
+        cd $(srcdir); $(MAKEINFO) ns-emacs.texi
+ns-emacs.dvi: ns-emacs.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ns-emacs.texi
+
 nxml-mode : $(infodir)/nxml-mode
 $(infodir)/nxml-mode: nxml-mode.texi
         cd $(srcdir); $(MAKEINFO) nxml-mode.texi
diff --git a/doc/emacs/ns-emacs.texi b/doc/misc/ns-emacs.texi
index 9a5c50d92de..e4d0f9951d6 100644
--- a/doc/emacs/ns-emacs.texi
+++ b/doc/misc/ns-emacs.texi
@@ -1,8 +1,13 @@
 \input texinfo @c -*-texinfo-*-
 
-@setfilename ../info/ns-emacs
+@setfilename ../../info/ns-emacs
 @settitle Emacs.app
 
+@dircategory Emacs
+@direntry
+* NS-Emacs: (ns-emacs).   Emacs.app for GNUstep and MacOS X.
+@end direntry
+
 @iftex
 @finalout
 @end iftex