diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | Makefile.DOS.template | 44 |
2 files changed, 49 insertions, 16 deletions
@@ -1,3 +1,24 @@ +2007-12-22 Eli Zaretskii <eliz@gnu.org> + + Suggested by Juan Manuel Guerrero <juan.guerrero@gmx.de>: + + * Makefile.DOS.template (info_TEXINFOS): Remove unused variable. + (TEXINFOS): Value changed to `doc/make.texi'. + (.SUFFIXES): Use .texi instead of .texinfo. + (make.info, make.dvi): Depend on doc/make.texi. + (.texi.info): New target, instead of ".texinfo.info". Change -I + switch to $(MAKEINFO) to look in doc/. Use --no-split. + (.texi): New target, instead of ".texinfo". Change -I switch to + $(MAKEINFO) to look in doc/. Use --no-split. + (.texi.dvi): New target, instead of ".texinfo.dvi". Change -I + switch to $(MAKEINFO) to look in doc/. + (install-info-am, uninstall-info): Don't look for "*.i[0-9]" and + "*.i[0-9][0-9]" (due to --no-split above). + (noinst_TEXINFOS, TEXI2HTML, TEXI2HTML_FLAGS): New variables. + (html, make_1.html): New targets. + (.PHONY): Add "html". + (.SUFFIXES): Add .html. + 2007-12-22 Juan Manuel Guerrero <juan.guerrero@gmx.de> (tiny change) * configh.dos.template [__DJGPP__]: Replace HAVE_SYS_SIGLIST with diff --git a/Makefile.DOS.template b/Makefile.DOS.template index abecee2..97b78a6 100644 --- a/Makefile.DOS.template +++ b/Makefile.DOS.template @@ -83,7 +83,6 @@ make_SOURCES = %SOURCES% libglob_a_SOURCES = %GLOB_SOURCES% make_LDADD = glob/libglob.a -info_TEXINFOS = make.texinfo man_MANS = make.1 INCLUDES = -I$(srcdir)/glob -DLIBDIR=\"c:/djgpp/lib\" -DINCLUDEDIR=\"c:/djgpp/include\" -DLOCALEDIR=\"$(localedir)\" @@ -118,10 +117,14 @@ TEXI2DVI = texi2dvi TEXINFO_TEX = $(srcdir)/config/texinfo.tex INFO_DEPS = make.info DVIS = make.dvi -TEXINFOS = make.texinfo +TEXINFOS = doc/make.texi +noinst_TEXINFOS = doc/fdl.texi doc/make-stds.texi man1dir = $(mandir)/man1 MANS = $(man_MANS) +TEXI2HTML = texi2html +TEXI2HTML_FLAGS = -split_chapter + NROFF = nroff DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 alloca.c build.sh-in config.h-in configure configure.in getloadavg.c @@ -136,7 +139,7 @@ HEADERS = $(wildcard $(srcdir)/*.h) default: all .SUFFIXES: -.SUFFIXES: .c .dvi .info .o .obj .ps .texinfo .tex +.SUFFIXES: .c .dvi .info .o .obj .ps .texi .tex .html mostlyclean-hdr: @@ -186,33 +189,41 @@ make$(EXEEXT): $(make_OBJECTS) $(make_DEPENDENCIES) @command.com /c if exist make.exe del make.exe $(LINK) $(make_LDFLAGS) $(make_OBJECTS) $(make_LDADD) $(LIBS) -make.info: make.texinfo -make.dvi: make.texinfo +# Documentation + +make.info: doc/make.texi +make.dvi: doc/make.texi DVIPS = dvips -.texinfo.info: +.texi.info: @command.com /c if exist make.info* del make.info* @command.com /c if exist make.i* del make.i* - $(MAKEINFO) -I$(srcdir) $< -o ./$@ + $(MAKEINFO) -I$(srcdir)/doc --no-split $< -o ./$@ -.texinfo: +.texi: @command.com /c if exist make.info* del make.info* @command.com /c if exist make.i* del make.i* - $(MAKEINFO) -I$(srcdir) $< -o ./$@ - -.texinfo.dvi: - TEXINPUTS="$(srcdir);$$TEXINPUTS" MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< + $(MAKEINFO) -I$(srcdir)/doc --no-split $< -o ./$@ +.texi.dvi: + TEXINPUTS="$(srcdir)/doc;$$TEXINPUTS" MAKEINFO='$(MAKEINFO) -I $(srcdir)/doc' $(TEXI2DVI) $< .dvi.ps: $(DVIPS) $< -o $@ +# Other documentation formats + +html: make_1.html + +make_1.html: $(TEXINFOS) $(noinst_TEXINFOS) + $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/doc/make.texi + install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(infodir) - @for file in $(INFO_DEPS) make.i; do d=$(srcdir); for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9] $$file[0-9] $$file[0-9][0-9]`; do if test -f $$d/$$ifile; then echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; else : ; fi; done; done + @for file in $(INFO_DEPS); do d=$(srcdir); for ifile in `cd $$d && echo $$file`; do if test -f $$d/$$ifile; then echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; else : ; fi; done; done @$(POST_INSTALL) @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then for file in $(INFO_DEPS); do echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file"; install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :; done; else : ; fi @@ -220,7 +231,7 @@ uninstall-info: $(PRE_UNINSTALL) @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then ii=yes; else ii=; fi; for file in $(INFO_DEPS); do test -z $ii || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; done $(NORMAL_UNINSTALL) - for file in $(INFO_DEPS) make.i; do (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9] $$file[0-9] $$file[0-9][0-9]); done + for file in $(INFO_DEPS); do (cd $(DESTDIR)$(infodir) && rm -f $$file); done dist-info: $(INFO_DEPS) for base in $(INFO_DEPS); do d=$(srcdir); for file in `cd $$d && eval echo $$base*`; do test -f $(distdir)/$$file || ln $$d/$$file $(distdir)/$$file 2> /dev/null || cp -p $$d/$$file $(distdir)/$$file; done; done @@ -235,7 +246,7 @@ clean-aminfo: distclean-aminfo: maintainer-clean-aminfo: - for i in $(INFO_DEPS) make.i; do rm -f `eval echo $$i*`; done + for i in $(INFO_DEPS); do rm -f $$i*; done install-man1: $(mkinstalldirs) $(DESTDIR)$(man1dir) @@ -455,7 +466,8 @@ maintainer-clean-depend info dvi check-local installcheck \ all-recursive-am all-am install-exec-am install-data-am uninstall-am \ install-exec install-data install uninstall all installdirs \ mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +maintainer-clean-generic clean mostlyclean distclean maintainer-clean \ +html # --------------- Local DIST Section |