# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1189055496 0
# Node ID 69a5b7649f84514c2e6a65f1dc2b671c016e71a4
# Parent  6c9d7b3b34e83abc9223d99b37617ca1439e22c9
(mansrcdir): New variable.
(SUBDIR_MAKEFILES): Update for new doc/ directory layout.
(man/Makefile, lispref/Makefile, lispintro/Makefile): Rename and
update these targets for new doc/ directory layout.
(doc/misc/Makefile): New target.
(install-arch-indep): Use mansrcdir for new location of manpages.
(mostlyclean, clean, distclean, maintainer-clean, unlock)
(relock, info, dvi): Update targets for new doc/ directory layout.

diff -r 6c9d7b3b34e8 -r 69a5b7649f84 Makefile.in
--- a/Makefile.in	Thu Sep 06 05:11:11 2007 +0000
+++ b/Makefile.in	Thu Sep 06 05:11:36 2007 +0000
@@ -158,6 +158,9 @@
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 srcdir=@srcdir@
 
+# Where the manpage source files are kept.
+mansrcdir=$(srcdir)/doc/man
+
 # Tell make where to find source files; this is needed for the makefiles.
 VPATH=@srcdir@
 
@@ -250,7 +253,7 @@
 SUBDIR = lib-src src
 
 # The makefiles of the directories in $SUBDIR.
-SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
+SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
 
 # Subdirectories to install, and where they'll go.
 # lib-src's makefile knows how to install it, so we don't do that here.
@@ -336,13 +339,16 @@
 lib-src/Makefile: $(srcdir)/lib-src/Makefile.in config.status
 	./config.status
 
-man/Makefile: $(srcdir)/man/Makefile.in config.status
+doc/emacs/Makefile: $(srcdir)/doc/emacs/Makefile.in config.status
 	./config.status
 
-lispref/Makefile: $(srcdir)/lispref/Makefile.in config.status
+doc/misc/Makefile: $(srcdir)/doc/misc/Makefile.in config.status
 	./config.status
 
-lispintro/Makefile: $(srcdir)/lispintro/Makefile.in config.status
+doc/lispref/Makefile: $(srcdir)/doc/lispref/Makefile.in config.status
+	./config.status
+
+doc/lispintro/Makefile: $(srcdir)/doc/lispintro/Makefile.in config.status
 	./config.status
 
 oldXMenu/Makefile: $(srcdir)/oldXMenu/Makefile.in config.status
@@ -534,10 +540,10 @@
 	else true; fi
 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
 	thisdir=`/bin/pwd`; \
-	cd ${srcdir}/etc; \
+	cd ${mansrcdir}; \
 	for page in emacs emacsclient etags ctags ; do \
 	  (cd $${thisdir}; \
-	   ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \
+	   ${INSTALL_DATA} ${mansrcdir}/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \
 	   chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \
 	done
 
@@ -620,9 +626,10 @@
 	(cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean)
 	(cd lwlib;    $(MAKE) $(MFLAGS) mostlyclean)
 	(cd lib-src;  $(MAKE) $(MFLAGS) mostlyclean)
-	-(cd man &&   $(MAKE) $(MFLAGS) mostlyclean)
-	-(cd lispref &&   $(MAKE) $(MFLAGS) mostlyclean)
-	-(cd lispintro &&   $(MAKE) $(MFLAGS) mostlyclean)
+	-(cd doc/emacs &&   $(MAKE) $(MFLAGS) mostlyclean)
+	-(cd doc/misc &&   $(MAKE) $(MFLAGS) mostlyclean)
+	-(cd doc/lispref &&   $(MAKE) $(MFLAGS) mostlyclean)
+	-(cd doc/lispintro &&   $(MAKE) $(MFLAGS) mostlyclean)
 	(cd leim;     $(MAKE) $(MFLAGS) mostlyclean)
 
 ### `clean'
@@ -638,9 +645,10 @@
 	(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
 	(cd lwlib;    $(MAKE) $(MFLAGS) clean)
 	(cd lib-src;  $(MAKE) $(MFLAGS) clean)
-	-(cd man &&   $(MAKE) $(MFLAGS) clean)
-	-(cd lispref &&   $(MAKE) $(MFLAGS) clean)
-	-(cd lispintro &&   $(MAKE) $(MFLAGS) clean)
+	-(cd doc/emacs &&   $(MAKE) $(MFLAGS) clean)
+	-(cd doc/misc &&   $(MAKE) $(MFLAGS) clean)
+	-(cd doc/lispref &&   $(MAKE) $(MFLAGS) clean)
+	-(cd doc/lispintro &&   $(MAKE) $(MFLAGS) clean)
 	(cd leim;     $(MAKE) $(MFLAGS) clean)
 
 ### `distclean'
@@ -658,9 +666,10 @@
 	(cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
 	(cd lwlib;    $(MAKE) $(MFLAGS) distclean)
 	(cd lib-src;  $(MAKE) $(MFLAGS) distclean)
-	(cd man &&    $(MAKE) $(MFLAGS) distclean)
-	(cd lispref &&    $(MAKE) $(MFLAGS) distclean)
-	(cd lispintro &&    $(MAKE) $(MFLAGS) distclean)
+	(cd doc/emacs &&    $(MAKE) $(MFLAGS) distclean)
+	(cd doc/misc &&    $(MAKE) $(MFLAGS) distclean)
+	(cd doc/lispref &&    $(MAKE) $(MFLAGS) distclean)
+	(cd doc/lispintro &&    $(MAKE) $(MFLAGS) distclean)
 	(cd leim;     $(MAKE) $(MFLAGS) distclean)
 	(cd lisp;     $(MAKE) $(MFLAGS) distclean)
 	${top_distclean}
@@ -681,9 +690,10 @@
 	(cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean)
 	(cd lwlib;    $(MAKE) $(MFLAGS) maintainer-clean)
 	(cd lib-src;  $(MAKE) $(MFLAGS) maintainer-clean)
-	-(cd man &&   $(MAKE) $(MFLAGS) maintainer-clean)
-	-(cd lispref &&   $(MAKE) $(MFLAGS) maintainer-clean)
-	-(cd lispintro &&   $(MAKE) $(MFLAGS) maintainer-clean)
+	-(cd doc/emacs &&   $(MAKE) $(MFLAGS) maintainer-clean)
+	-(cd doc/misc &&   $(MAKE) $(MFLAGS) maintainer-clean)
+	-(cd doc/lispref &&   $(MAKE) $(MFLAGS) maintainer-clean)
+	-(cd doc/lispintro &&   $(MAKE) $(MFLAGS) maintainer-clean)
 	(cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
 	(cd lisp;     $(MAKE) $(MFLAGS) maintainer-clean)
 	${top_distclean}
@@ -720,9 +730,10 @@
 	(cd lib-src; $(MAKE) $(MFLAGS) unlock)
 	(cd lisp; $(MAKE) $(MFLAGS) unlock)
 	(cd lisp/term; chmod u+w README *.el)
-	(cd man; chmod u+w *texi* ChangeLog split-man)
-	(cd lispref; chmod u+w *texi* ChangeLog)
-	(cd lispintro; chmod u+w *texi* ChangeLog)
+	(cd doc/emacs; chmod u+w *.texi ChangeLog)
+	(cd doc/misc; chmod u+w *.texi ChangeLog)
+	(cd doc/lispref; chmod u+w *texi* ChangeLog)
+	(cd doc/lispintro; chmod u+w *texi* ChangeLog)
 	(cd oldXMenu; chmod u+w *.[ch] Makefile README)
 	(cd lwlib; chmod u+w *.[ch] Makefile README)
 	(cd src; $(MAKE) $(MFLAGS) unlock)
@@ -733,12 +744,13 @@
 	(cd etc; $(MAKE) $(MFLAGS) relock)
 	(cd lib-src; $(MAKE) $(MFLAGS) relock)
 	(cd lisp; $(MAKE) $(MFLAGS) relock)
-	(cd lisp/term; chmod u+w README *.el)
-	(cd man; chmod u+w *texi* ChangeLog split-man)
-	(cd lispref; chmod u+w *texi* ChangeLog)
-	(cd lispintro; chmod u+w *texi* ChangeLog)
-	(cd oldXMenu; chmod u+w *.[ch] Makefile README)
-	(cd lwlib; chmod u+w *.[ch] Makefile README)
+	(cd lisp/term; chmod u-w README *.el)
+	(cd doc/emacs; chmod u-w *.texi ChangeLog)
+	(cd doc/misc; chmod u-w *.texi ChangeLog)
+	(cd doc/lispref; chmod u-w *texi* ChangeLog)
+	(cd doc/lispintro; chmod u-w *texi* ChangeLog)
+	(cd oldXMenu; chmod u-w *.[ch] Makefile README)
+	(cd lwlib; chmod u-w *.[ch] Makefile README)
 	(cd src; $(MAKE) $(MFLAGS) relock)
 
 # The src subdir knows how to do the right thing
@@ -758,13 +770,15 @@
 # put the info files in $(srcdir),
 # so we can do ok running make in the build dir.
 info: force-info
-	-(cd man; $(MAKE) $(MFLAGS) info)
-	-(cd lispref; $(MAKE) $(MFLAGS) info)
-	-(cd lispintro; $(MAKE) $(MFLAGS) info)
+	-(cd doc/emacs; $(MAKE) $(MFLAGS) info)
+	-(cd doc/misc; $(MAKE) $(MFLAGS) info)
+	-(cd doc/lispref; $(MAKE) $(MFLAGS) info)
+	-(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
 dvi:
-	(cd man; $(MAKE) $(MFLAGS) dvi)
-	(cd lispref; $(MAKE) $(MFLAGS) elisp.dvi)
-	(cd lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
+	(cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
+	(cd doc/misc; $(MAKE) $(MFLAGS) dvi)
+	(cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi)
+	(cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
 
 #### Bootstrapping.
 
@@ -813,7 +827,8 @@
 	(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
 	(cd lwlib;    $(MAKE) $(MFLAGS) clean)
 	(cd lib-src;  $(MAKE) $(MFLAGS) clean)
-	-(cd man &&   $(MAKE) $(MFLAGS) clean)
-	-(cd lispref &&   $(MAKE) $(MFLAGS) clean)
-	-(cd lispintro &&   $(MAKE) $(MFLAGS) clean)
+	-(cd doc/emacs &&   $(MAKE) $(MFLAGS) clean)
+	-(cd doc/misc &&   $(MAKE) $(MFLAGS) clean)
+	-(cd doc/lispref &&   $(MAKE) $(MFLAGS) clean)
+	-(cd doc/lispintro &&   $(MAKE) $(MFLAGS) clean)
 	(cd leim;     $(MAKE) $(MFLAGS) clean)