diff man/Makefile @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents e358b6c40407
children bd3e7db3bdf6 e82f5b7010fe
line wrap: on
line diff
--- a/man/Makefile	Sat Dec 26 00:20:27 2009 -0600
+++ b/man/Makefile	Sat Dec 26 21:18:49 2009 -0600
@@ -23,8 +23,9 @@
 SHELL    = /bin/sh
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
-TEXI2HTML = texi2html -verbose -subdir $(HTMLDIR)
-TEXI2HTML_SPLIT = $(TEXI2HTML) -split chapter
+TEXI2HTML = texi2html
+TEXI2HTML_NOSPLIT = $(TEXI2HTML) -verbose -subdir $(HTMLDIR)
+TEXI2HTML_SPLIT = $(TEXI2HTML) -verbose -subdir $(HTMLDIR) -split chapter
 
 RM = rm -f
 CP = cp
@@ -49,16 +50,16 @@
 	$(INFODIR)/emodules.info \
 	$(INFODIR)/external-widget.info \
 	$(INFODIR)/info.info \
+	$(INFODIR)/internals.info \
 	$(INFODIR)/lispref.info \
-	$(INFODIR)/internals.info \
 	$(INFODIR)/new-users-guide.info \
 	$(INFODIR)/standards.info \
 	$(INFODIR)/term.info \
 	$(INFODIR)/termcap.info \
 	$(INFODIR)/texinfo.info \
 	$(INFODIR)/widget.info \
-	$(INFODIR)/xemacs.info \
-	$(INFODIR)/xemacs-faq.info
+	$(INFODIR)/xemacs-faq.info \
+	$(INFODIR)/xemacs.info
 
 html_files = \
 	$(HTMLDIR)/beta.html \
@@ -354,7 +355,7 @@
 ############################################################################
 
 $(HTMLDIR)/beta.html : beta.texi
-	$(TEXI2HTML) beta.texi
+	$(TEXI2HTML_NOSPLIT) beta.texi
 
 $(HTMLDIR)/cl.html : cl.texi
 	$(TEXI2HTML_SPLIT) cl.texi
@@ -387,7 +388,7 @@
 	$(TEXI2HTML_SPLIT) widget.texi
 
 $(HTMLDIR)/xemacs-faq.html : xemacs-faq.texi
-	$(TEXI2HTML) xemacs-faq.texi
+	$(TEXI2HTML_NOSPLIT) xemacs-faq.texi
 	$(TEXI2HTML_SPLIT) -top_file xemacs-faq_1.html xemacs-faq.texi
 	$(CP) $(PHOTODIR)/ben.png $(HTMLDIR)
 	$(CP) $(PHOTODIR)/cthomp.png $(HTMLDIR)