"nmake info" Windows patch

"nmake info" Windows patch

[Peter 'Luna' Runestig]

Hi all,

Here is another thing I mentioned on bug-gnu-emacs some time ago. This
patch that adds the `info' target to the Windows build. Tested with
MSVC6/CygWin 1.3.20.
ftp://ftp.runestig.com/pub/emacs/emacs-20030219-makeinfo.patch
http://ftp.runestig.com/pub/emacs/emacs-20030219-makeinfo.patch

Cheers,
- Peter
-- 
Peter 'Luna' Runestig (fd. Altberg), Sweden <peter@runestig.com>
PGP Key ID: 0xD07BBE13
Fingerprint: 7B5C 1F48 2997 C061 DE4B  42EA CB99 A35C D07B BE13
AOL Instant Messenger Screen name: PRunestig

Re: "nmake info" Windows patch

[Peter 'Luna' Runestig]

"Peter 'Luna' Runestig" <peter@runestig.com> writes:
> Here is another thing I mentioned on bug-gnu-emacs some time ago. This
> patch that adds the `info' target to the Windows build. Tested with
> MSVC6/CygWin 1.3.20.
> ftp://ftp.runestig.com/pub/emacs/emacs-20030219-makeinfo.patch
> http://ftp.runestig.com/pub/emacs/emacs-20030219-makeinfo.patch

By request, I'm actually posting the patch here. I take it it's the
preferred way in this forum then. You never now, sometimes people bitch
over a sig > four lines...

diff -burN emacs-20030219.orig/lispintro/makefile.w32-in emacs-20030219/lispintro/makefile.w32-in
--- emacs-20030219.orig/lispintro/makefile.w32-in	1970-01-01 01:00:00.000000000 +0100
+++ emacs-20030219/lispintro/makefile.w32-in	2003-02-21 21:23:01.000000000 +0100
@@ -0,0 +1,70 @@
+#### Makefile for the Emacs Lisp Introduction manual
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+SHELL = cmd
+
+srcdir = .
+
+infodir = $(srcdir)/../info
+
+INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi
+# The file name eintr must fit within 5 characters, to allow for
+# -NN extensions to fit into DOS 8+3 limits without clashing
+INFO_TARGETS = $(infodir)/eintr
+DVI_TARGETS = emacs-lisp-intro.dvi
+
+MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
+DVIPS = dvips
+ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+
+.SUFFIXES: .dvi .ps .texi
+
+info: $(INFO_TARGETS)
+
+dvi: $(DVI_TARGETS)
+
+$(infodir)/eintr: $(INFO_SOURCES)
+	$(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi
+
+emacs-lisp-intro.dvi: $(INFO_SOURCES)
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi
+
+emacs-lisp-intro.html: $(INFO_SOURCES)
+	$(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi
+
+.dvi.ps:
+	$(DVIPS) $< -o $@
+
+mostlyclean:
+	rm -f  *.log *.cp *.fn *.ky *.pg *.vr *.tp
+
+clean: mostlyclean
+	rm -f *.dvi
+
+distclean: clean
+
+maintainer-clean: distclean
+	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -burN emacs-20030219.orig/lispref/makefile.w32-in emacs-20030219/lispref/makefile.w32-in
--- emacs-20030219.orig/lispref/makefile.w32-in	1970-01-01 01:00:00.000000000 +0100
+++ emacs-20030219/lispref/makefile.w32-in	2003-02-21 21:23:01.000000000 +0100
@@ -0,0 +1,160 @@
+# Makefile for the GNU Emacs Lisp Reference Manual.
+
+# Copyright (C) 1990,1991,1992,1993,1994,1995,1996,1998,1999,2000,2001
+#  Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Standard configure variables.
+srcdir = .
+
+infodir = $(srcdir)/../info
+
+# Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
+# TEX=platex
+TEX=tex
+SHELL=cmd
+INSTALL_INFO = install-info
+MAKEINFO = makeinfo
+
+# The environment variable and its value to add $(srcdir) to the path
+# searched for TeX input files.
+texinputdir = TEXINPUTS=$(srcdir):"$(TEXINPUTS)"
+
+# The name of the manual:
+VERSION=2.9
+manual = elisp-manual-21-$(VERSION)
+
+# Uncomment this line for permuted index.
+# permuted_index = 1 
+
+# List of all the texinfo files in the manual:
+
+srcs = \
+  $(srcdir)/abbrevs.texi \
+  $(srcdir)/advice.texi \
+  $(srcdir)/anti.texi \
+  $(srcdir)/back.texi \
+  $(srcdir)/backups.texi \
+  $(srcdir)/buffers.texi \
+  $(srcdir)/calendar.texi \
+  $(srcdir)/commands.texi \
+  $(srcdir)/compile.texi \
+  $(srcdir)/control.texi \
+  $(srcdir)/customize.texi \
+  $(srcdir)/debugging.texi \
+  $(srcdir)/display.texi \
+  $(srcdir)/edebug.texi \
+  $(srcdir)/elisp.texi \
+  $(srcdir)/errors.texi \
+  $(srcdir)/eval.texi \
+  $(srcdir)/files.texi \
+  $(srcdir)/frames.texi \
+  $(srcdir)/functions.texi \
+  $(srcdir)/hash.texi \
+  $(srcdir)/help.texi \
+  $(srcdir)/hooks.texi \
+  $(srcdir)/internals.texi \
+  $(srcdir)/intro.texi \
+  $(srcdir)/keymaps.texi \
+  $(srcdir)/lists.texi \
+  $(srcdir)/loading.texi \
+  $(srcdir)/locals.texi \
+  $(srcdir)/macros.texi \
+  $(srcdir)/maps.texi \
+  $(srcdir)/markers.texi \
+  $(srcdir)/minibuf.texi \
+  $(srcdir)/modes.texi \
+  $(srcdir)/nonascii.texi \
+  $(srcdir)/numbers.texi \
+  $(srcdir)/objects.texi \
+  $(srcdir)/os.texi \
+  $(srcdir)/positions.texi \
+  $(srcdir)/processes.texi \
+  $(srcdir)/searching.texi \
+  $(srcdir)/sequences.texi \
+  $(srcdir)/streams.texi \
+  $(srcdir)/strings.texi \
+  $(srcdir)/symbols.texi \
+  $(srcdir)/syntax.texi \
+  $(srcdir)/text.texi \
+  $(srcdir)/tips.texi \
+  $(srcdir)/variables.texi \
+  $(srcdir)/windows.texi \
+  $(srcdir)/index.unperm \
+  $(srcdir)/index.perm \
+  $(srcdir)/gpl.texi \
+  $(srcdir)/doclicense.texi
+
+
+.PHONY: clean
+
+# The info file is named `elisp'.
+info: $(infodir)/elisp
+
+$(infodir)/elisp: $(srcs) index.texi
+	$(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
+
+elisp.dvi: $(srcs) index.texi
+	# Avoid losing old contents of aux file entirely.
+	-mv elisp.aux elisp.oaux
+	# First shot to define xrefs.
+	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
+	if [ a$(permuted_index) != a ]; \
+	then \
+	  $(srcdir)/permute-index; \
+	  mv permuted.fns elisp.fns; \
+	  texindex elisp.tp; \
+	else \
+	  texindex elisp.??; \
+	fi
+	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
+
+index.texi:
+	  cp $(srcdir)/index.unperm index.texi
+
+install: elisp
+	$(srcdir)/mkinstalldirs $(infodir)
+	cp elisp elisp-* $(infodir)
+	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
+
+clean:
+	rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
+              *.vr *.vrs *.pg *.pgs *.ky *.kys
+	rm -f make.out core 
+	rm -f index.texi
+
+distclean: clean
+
+maintainer-clean: clean
+	rm -f elisp elisp-* elisp.dvi elisp.oaux
+
+dist: elisp elisp.dvi
+	-rm -rf temp
+	-mkdir temp
+	-mkdir temp/$(manual)
+	-ln $(srcdir)/README $(srcdir)/configure.in $(srcdir)/configure \
+ $(srcdir)/Makefile.in $(srcdir)/permute-index $(srcs) \
+ $(srcdir)/../man/texinfo.tex \
+ elisp.dvi elisp.aux elisp.??s elisp elisp-[0-9] elisp-[0-9][0-9] \
+ temp/$(manual)
+	-(cd temp/$(manual); rm -f mkinstalldirs)
+	cp $(srcdir)/mkinstalldirs temp/$(manual)
+	(cd temp/$(manual); rm -f *~)
+	(cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
+	-rm -rf temp
diff -burN emacs-20030219.orig/man/makefile.w32-in emacs-20030219/man/makefile.w32-in
--- emacs-20030219.orig/man/makefile.w32-in	1970-01-01 01:00:00.000000000 +0100
+++ emacs-20030219/man/makefile.w32-in	2003-02-21 21:09:42.000000000 +0100
@@ -0,0 +1,295 @@
+#### Makefile for the Emacs Manual and other documentation.
+
+# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001
+#  Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Where to find the source code.  The source code for Emacs's C kernel is
+# expected to be in ${srcdir}/src, and the source code for Emacs's
+# utility programs is expected to be in ${srcdir}/lib-src.  This is
+# set by the configure script's `--srcdir' option.
+srcdir=.
+
+
+# The makeinfo program is part of the Texinfo distribution.
+MAKEINFO = makeinfo
+INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
+	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+		../info/info ../info/message ../info/mh-e ../info/reftex \
+		../info/sc ../info/vip ../info/viper ../info/widget \
+		../info/efaq ../info/ada-mode ../info/autotype ../info/calc \
+		../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
+		../info/woman ../info/emacs-mime ../info/eshell \
+		../info/speedbar ../info/tramp ../info/ses
+DVI_TARGETS = 	emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
+		 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
+		 reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
+		 ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
+		 pcl-cvs.dvi woman.dvi emacs-mime.dvi eshell.dvi \
+		 speedbar.dvi tramp.dvi ses.dvi
+INFOSOURCES = info.texi
+
+# The following rule does not work with all versions of `make'.
+.SUFFIXES: .texi .dvi
+.texi.dvi:
+	texi2dvi $<
+
+TEXI2DVI = texi2dvi
+ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" 
+
+EMACSSOURCES= \
+	$(srcdir)/emacs.texi \
+	$(srcdir)/doclicense.texi \
+	$(srcdir)/screen.texi \
+	$(srcdir)/commands.texi \
+	$(srcdir)/entering.texi \
+	$(srcdir)/basic.texi \
+	$(srcdir)/mini.texi \
+	$(srcdir)/m-x.texi \
+	$(srcdir)/help.texi \
+	$(srcdir)/mark.texi \
+	$(srcdir)/killing.texi \
+	$(srcdir)/regs.texi \
+	$(srcdir)/display.texi \
+	$(srcdir)/search.texi \
+	$(srcdir)/fixit.texi \
+	$(srcdir)/files.texi \
+	$(srcdir)/buffers.texi \
+	$(srcdir)/windows.texi \
+	$(srcdir)/frames.texi \
+	$(srcdir)/mule.texi \
+	$(srcdir)/major.texi \
+	$(srcdir)/indent.texi \
+	$(srcdir)/text.texi \
+	$(srcdir)/programs.texi \
+	$(srcdir)/building.texi \
+	$(srcdir)/maintaining.texi \
+	$(srcdir)/abbrevs.texi \
+	$(srcdir)/picture.texi \
+	$(srcdir)/sending.texi \
+	$(srcdir)/rmail.texi \
+	$(srcdir)/dired.texi \
+	$(srcdir)/calendar.texi \
+	$(srcdir)/misc.texi \
+	$(srcdir)/custom.texi \
+	$(srcdir)/trouble.texi \
+	$(srcdir)/cmdargs.texi \
+	$(srcdir)/xresources.texi \
+	$(srcdir)/anti.texi \
+	$(srcdir)/macos.texi \
+	$(srcdir)/msdog.texi \
+	$(srcdir)/gnu.texi \
+	$(srcdir)/glossary.texi \
+	$(srcdir)/ack.texi
+
+info: $(INFO_TARGETS)
+
+dvi: $(DVI_TARGETS)
+
+# Note that all the Info targets build the Info files
+# in srcdir.  There is no provision for Info files
+# to exist in the build directory.
+# In a distribution of Emacs, the Info files should be up to date.
+
+# The following target uses an explicit -o switch to work around
+# the @setfilename directive in info.texi, which is required for
+# the Texinfo distribution.
+
+../info/info: $(INFOSOURCES)
+	$(MAKEINFO) --no-split info.texi -o $@
+
+info.dvi: $(INFOSOURCES)
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi
+
+../info/emacs: $(EMACSSOURCES)
+	$(MAKEINFO) emacs.texi
+
+emacs.dvi: $(EMACSSOURCES)
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs.texi
+
+# This target is here so you could easily get the list of the *.texi
+# files which belong to the Emacs manual (as opposed to the separate
+# manuals for CL, CC Mode, Ebrowse, etc.).  With this target, you can
+# say things like "grep foo `make emacsman`".
+emacsman:
+	@echo $(EMACSSOURCES)
+
+../info/ccmode: cc-mode.texi
+	$(MAKEINFO) cc-mode.texi
+cc-mode.dvi: cc-mode.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/cc-mode.texi
+
+../info/ada-mode: ada-mode.texi
+	$(MAKEINFO) ada-mode.texi
+ada-mode.dvi: ada-mode.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ada-mode.texi
+
+../info/pcl-cvs: pcl-cvs.texi
+	$(MAKEINFO) pcl-cvs.texi
+pcl-cvs.dvi: pcl-cvs.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/pcl-cvs.texi
+
+../info/eshell: eshell.texi
+	$(MAKEINFO) eshell.texi
+eshell.dvi: eshell.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/eshell.texi
+
+../info/cl: cl.texi
+	$(MAKEINFO) cl.texi
+cl.dvi: cl.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/cl.texi
+
+../info/dired-x: dired-x.texi
+	$(MAKEINFO) dired-x.texi
+dired-x.dvi: dired-x.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/dired-x.texi
+
+../info/ediff: ediff.texi
+	$(MAKEINFO) ediff.texi
+ediff.dvi: ediff.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ediff.texi
+
+../info/forms: forms.texi
+	$(MAKEINFO) forms.texi
+forms.dvi: forms.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/forms.texi
+
+../info/gnus: gnus.texi
+	$(MAKEINFO) gnus.texi
+gnus.dvi: gnus.texi
+	sed -e '/@iflatex/,/@end iflatex/d' $(srcdir)/gnus.texi > gnustmp.texi 
+	$(ENVADD) $(TEXI2DVI) gnustmp.texi
+	cp gnustmp.dvi $*.dvi
+	rm gnustmp.*
+
+../info/message: message.texi
+	$(MAKEINFO) message.texi
+message.dvi: message.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/message.texi
+
+../info/mh-e: mh-e.texi
+	$(MAKEINFO) mh-e.texi
+mh-e.dvi: mh-e.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/mh-e.texi
+
+../info/reftex: reftex.texi
+	$(MAKEINFO) reftex.texi
+reftex.dvi: reftex.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/reftex.texi
+
+../info/sc: sc.texi
+	$(MAKEINFO) sc.texi
+sc.dvi: sc.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/sc.texi
+
+../info/vip: vip.texi
+	$(MAKEINFO) vip.texi
+vip.dvi: vip.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/vip.texi
+
+../info/viper: viper.texi
+	$(MAKEINFO) viper.texi
+viper.dvi: viper.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/viper.texi
+
+../info/widget: widget.texi
+	$(MAKEINFO) widget.texi
+widget.dvi: widget.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
+
+../info/efaq: faq.texi
+	$(MAKEINFO) faq.texi
+faq.dvi: faq.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
+
+../etc/GNU: gnu1.texi gnu.texi
+	cd $(srcdir) && makeinfo --no-headers -o ../etc/GNU gnu1.texi
+
+../info/autotype: autotype.texi
+	$(MAKEINFO) autotype.texi
+autotype.dvi: autotype.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi
+
+../info/calc: calc.texi
+	$(MAKEINFO) calc.texi
+
+calc.dvi: calc.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi
+
+# This is produced with --no-split to avoid making files whose
+# names clash on DOS 8+3 filesystems
+../info/idlwave: idlwave.texi
+	$(MAKEINFO) --no-split idlwave.texi
+idlwave.dvi: idlwave.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/idlwave.texi
+
+../info/eudc: eudc.texi
+	$(MAKEINFO) eudc.texi
+eudc.dvi: eudc.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/eudc.texi
+
+../info/ebrowse: ebrowse.texi
+	$(MAKEINFO) ebrowse.texi
+ebrowse.dvi: ebrowse.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ebrowse.texi
+
+../info/woman: woman.texi
+	$(MAKEINFO) woman.texi
+woman.dvi: woman.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/woman.texi
+
+../info/speedbar: speedbar.texi
+	$(MAKEINFO) speedbar.texi
+speedbar.dvi: speedbar.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/speedbar.texi
+
+../info/emacs-mime: emacs-mime.texi
+	$(MAKEINFO) emacs-mime.texi
+emacs-mime.dvi: emacs-mime.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi
+
+../info/tramp: tramp.texi
+	$(MAKEINFO) tramp.texi
+tramp.dvi: tramp.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/tramp.texi
+
+../info/ses: ses.texi
+	$(MAKEINFO) ses.texi
+ses.dvi: ses.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ses.texi
+
+mostlyclean:
+	rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
+
+clean: mostlyclean
+	rm -f *.dvi
+
+distclean: clean
+
+maintainer-clean: distclean
+	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+# Don't delete these, because they are outside the current directory.
+#	for file in $(INFO_TARGETS); do rm -f $${file}*; done
+
+
+# Formerly this directory had texindex.c and getopt.c in it
+# and this makefile built them to make texindex.
+# That caused trouble because this is run entirely in the source directory.
+# Since we expect to get texi2dvi from elsewhere,
+# it is ok to expect texindex from elsewhere also.
diff -burN emacs-20030219.orig/nt/configure.bat emacs-20030219/nt/configure.bat
--- emacs-20030219.orig/nt/configure.bat	2003-02-07 10:04:54.000000000 +0100
+++ emacs-20030219/nt/configure.bat	2003-02-21 21:23:01.000000000 +0100
@@ -433,6 +433,9 @@
 copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile
 copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile
 copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile
+copy /b config.settings+%MAKECMD%.defs+..\man\makefile.w32-in ..\man\makefile
+copy /b config.settings+%MAKECMD%.defs+..\lispref\makefile.w32-in ..\lispref\makefile
+copy /b config.settings+%MAKECMD%.defs+..\lispintro\makefile.w32-in ..\lispintro\makefile
 if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix
 if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile
 copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile
diff -burN emacs-20030219.orig/nt/makefile.w32-in emacs-20030219/nt/makefile.w32-in
--- emacs-20030219.orig/nt/makefile.w32-in	2003-02-07 10:04:54.000000000 +0100
+++ emacs-20030219/nt/makefile.w32-in	2003-02-21 21:23:01.000000000 +0100
@@ -214,6 +214,15 @@
 	$(MAKE) $(MFLAGS) -C ../lisp install
 	$(MAKE) $(MFLAGS) -C ../leim install
 
+force-info:
+# Note that man/makefile knows how to
+# 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)
+
 #
 # Maintenance
 #

Re: "nmake info" Windows patch

[Eli Zaretskii]

> From: "Peter 'Luna' Runestig" <peter@runestig.com>
> Date: 22 Feb 2003 00:14:04 +0100
> 
> "Peter 'Luna' Runestig" <peter@runestig.com> writes:
> > Here is another thing I mentioned on bug-gnu-emacs some time ago. This
> > patch that adds the `info' target to the Windows build. Tested with
> > MSVC6/CygWin 1.3.20.
> > ftp://ftp.runestig.com/pub/emacs/emacs-20030219-makeinfo.patch
> > http://ftp.runestig.com/pub/emacs/emacs-20030219-makeinfo.patch
> 
> By request, I'm actually posting the patch here. I take it it's the
> preferred way in this forum then. You never now, sometimes people bitch
> over a sig > four lines...
> [...]
> +SHELL = cmd
> [...]
> +MAKEINFO = makeinfo
> +TEXI2DVI = texi2dvi
> +DVIPS = dvips
> +ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
> [...]
> +emacs-lisp-intro.dvi: $(INFO_SOURCES)
> +	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi

Does this really work in native Windows environment (i.e. without
Cygwin being installed)?  I don't think CMD.EXE can run Unix shell
scripts such as texi2dvi, and neither I think that a native Windows
port of makeinfo will DTRT with the value of TEXINPUTS where
directories are separated by colons (instead of semi-colons).

If this only works with Cygwin tools, we should at least tell that
somewhere.  What would be _really_ nice if at least some targets would
work with native Windows tools, not only with Cygwin.  For example:

> +mostlyclean:
> +	rm -f  *.log *.cp *.fn *.ky *.pg *.vr *.tp
> +
> +clean: mostlyclean
> +	rm -f *.dvi

There's no reason not to use CMD's built-in DEL command here (perhaps
with a FOR loop).

> +++ emacs-20030219/nt/makefile.w32-in	2003-02-21 21:23:01.000000000 +0100
> @@ -214,6 +214,15 @@
>  	$(MAKE) $(MFLAGS) -C ../lisp install
>  	$(MAKE) $(MFLAGS) -C ../leim install
>  
> +force-info:
> +# Note that man/makefile knows how to
> +# 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)

This also won't work except with Cygwin Bash (or some other ported
Unix shell) as your shell.

Apologies if I missed some of this thread earlier, which stated that
the intent is indeed to make this work with Cygwin only.

Re: "nmake info" Windows patch

[Peter 'Luna' Runestig]

On 2003-02-22 10:21, Eli Zaretskii wrote:
>> [...]
>> +SHELL = cmd
>> [...]
>> +MAKEINFO = makeinfo
>> +TEXI2DVI = texi2dvi
>> +DVIPS = dvips
>> +ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
>> [...]
>> +emacs-lisp-intro.dvi: $(INFO_SOURCES)
>> +	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi
> 
> Does this really work in native Windows environment (i.e. without
> Cygwin being installed)?  I don't think CMD.EXE can run Unix shell
> scripts such as texi2dvi, and neither I think that a native Windows
> port of makeinfo will DTRT with the value of TEXINPUTS where
> directories are separated by colons (instead of semi-colons).

The `info' target works in native Windows (well, on XP at least). I
cheated a bit when making the `makefile.w32-in' files, by copying the
`Makefile.in' files, and tweaking them until the `info' target worked.
So, yes, there are stuff left there that cmd.exe can't handle, but it's
never been called upon in my testings.

> If this only works with Cygwin tools, we should at least tell that
> somewhere.

That's not the intention, but I've used `cp', `rm' and `makeinfo' (and
dependencies to that) from Cygwin when testing this.

> What would be _really_ nice if at least some targets would
> work with native Windows tools, not only with Cygwin.  For example:
> 
>> +mostlyclean:
>> +	rm -f  *.log *.cp *.fn *.ky *.pg *.vr *.tp
>> +
>> +clean: mostlyclean
>> +	rm -f *.dvi
> There's no reason not to use CMD's built-in DEL command here (perhaps
> with a FOR loop).

Sure, but you need `rm' to build emacs anyway.

>> +++ emacs-20030219/nt/makefile.w32-in	2003-02-21 21:23:01.000000000 +0100
>> @@ -214,6 +214,15 @@
>>  	$(MAKE) $(MFLAGS) -C ../lisp install
>>  	$(MAKE) $(MFLAGS) -C ../leim install
>>  
>> +force-info:
>> +# Note that man/makefile knows how to
>> +# 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)
> 
> This also won't work except with Cygwin Bash (or some other ported
> Unix shell) as your shell.

This works fine with cmd.exe.

Cheers,
- Peter
-- 
Peter 'Luna' Runestig (fd. Altberg), Sweden <peter@runestig.com>
PGP Key ID: 0xD07BBE13
Fingerprint: 7B5C 1F48 2997 C061 DE4B  42EA CB99 A35C D07B BE13
AOL Instant Messenger Screen name: PRunestig

Re: "nmake info" Windows patch

[Juanma Barranquero]

On Sat, 22 Feb 2003 10:53:19 +0100
"Peter 'Luna' Runestig" <peter@runestig.com> wrote:

> This works fine with cmd.exe.

I think the idea is that we should be able to build with W9X/Me's
COMMAND.COM too...

-- 
Juanma Barranquero <lektu@terra.es>

Re: "nmake info" Windows patch

[Eli Zaretskii]

> Date: Sat, 22 Feb 2003 12:40:11 +0100
> From: Juanma Barranquero <lektu@terra.es>
> 
> > This works fine with cmd.exe.
> 
> I think the idea is that we should be able to build with W9X/Me's
> COMMAND.COM too...

Yes, indeed.  That's what I meant to say; sorry if I was unclear.

Re: "nmake info" Windows patch

[Peter 'Luna' Runestig]

On 2003-02-22 12:40, Juanma Barranquero wrote:
> On Sat, 22 Feb 2003 10:53:19 +0100
> "Peter 'Luna' Runestig" <peter@runestig.com> wrote:
> 
>> This works fine with cmd.exe.
> 
> I think the idea is that we should be able to build with W9X/Me's
> COMMAND.COM too...

Hi again,

Am I correct in understanding that this patch was turned down because it
didn't work on Windows 9x/ME, or was it that it was only tested with
CygWin tools?

Cheers,
- Peter
-- 
Peter 'Luna' Runestig (fd. Altberg), Sweden <peter@runestig.com>
PGP Key ID: 0xD07BBE13
Fingerprint: 7B5C 1F48 2997 C061 DE4B  42EA CB99 A35C D07B BE13
AOL Instant Messenger Screen name: PRunestig
Yahoo! Messenger profile name: altberg

Re: "nmake info" Windows patch

[Jason Rumney]

Peter 'Luna' Runestig wrote:
> On 2003-02-22 12:40, Juanma Barranquero wrote:
> 
>>On Sat, 22 Feb 2003 10:53:19 +0100
>>"Peter 'Luna' Runestig" <peter@runestig.com> wrote:
>>
>>
>>>This works fine with cmd.exe.
>>
>>I think the idea is that we should be able to build with W9X/Me's
>>COMMAND.COM too...
> 
> 
> Hi again,
> 
> Am I correct in understanding that this patch was turned down because it
> didn't work on Windows 9x/ME, or was it that it was only tested with
> CygWin tools?

No, it is more like noone had the time to follow it up at the time.
Most of my mail between late 2002 and end of April has been lost, so
can you please resend the patch.

Re: "nmake info" Windows patch

[Juanma Barranquero]

On Tue, 20 May 2003 11:08:07 +0200
"Peter 'Luna' Runestig" <peter@runestig.com> wrote:

> >> This works fine with cmd.exe.
> > 
> > I think the idea is that we should be able to build with W9X/Me's
> > COMMAND.COM too...

> Am I correct in understanding that this patch was turned down because it
> didn't work on Windows 9x/ME, or was it that it was only tested with
> CygWin tools?

I'll take a look to my e-mail records ASAP, but speaking from memory, I
seem to remember the issue was in fact a problem with COMMAND.COM. 
Emacs, I was told, should be compilable and, if posible, bootstrappable
from a W9X/Me system (even if the number of Windows users who're going
to compile, not to mention bootstrap, Emacs on W9X/Me is vanishingly
small).

In any case, if I did test it, most probably it was *not* with Cygwin
tools. But I no longer have a W9X/Me platform at hand to test Emacs, so
I cannot offer any help.

Anyway, Jason is right: IIRC, the patch was not actively turned down,
time just ran off.

                                                                Juanma

Re: "nmake info" Windows patch

[Eli Zaretskii]

> Date: Sat, 22 Feb 2003 10:53:19 +0100
> From: "Peter 'Luna' Runestig" <peter@runestig.com>
> > 
> > Does this really work in native Windows environment (i.e. without
> > Cygwin being installed)?  I don't think CMD.EXE can run Unix shell
> > scripts such as texi2dvi, and neither I think that a native Windows
> > port of makeinfo will DTRT with the value of TEXINPUTS where
> > directories are separated by colons (instead of semi-colons).
> 
> The `info' target works in native Windows (well, on XP at least).

I think it will only work with the Cygwin port of makeinfo.  Native
Windows ports of makeinfo use semi-colons to separate directories in
TEXINPUTS and other variables that hold lists of directories.

I don't mind if we require the Cygwin port of makeinfo (assuming it's
okay with Jason, Andrew, and other developers who work on the Windows
port of Emacs), but I think we should at least tell that clearly in
the docs.

Re: "nmake info" Windows patch

[Jason Rumney]

"Eli Zaretskii" <eliz@is.elta.co.il> writes:

> I don't mind if we require the Cygwin port of makeinfo (assuming it's
> okay with Jason, Andrew, and other developers who work on the Windows
> port of Emacs), but I think we should at least tell that clearly in
> the docs.

Requiring the cygwin port is not ideal, but it is better than not
having proper make rules to build the info files on Windows.  Since
this only affects people who compile from CVS, we can live with this
until someone has time to make native ports of makeinfo work.

Re: "nmake info" Windows patch

[Jason Rumney]

"Eli Zaretskii" <eliz@is.elta.co.il> writes:

> > +mostlyclean:
> > +	rm -f  *.log *.cp *.fn *.ky *.pg *.vr *.tp
> > +
> > +clean: mostlyclean
> > +	rm -f *.dvi
> 
> There's no reason not to use CMD's built-in DEL command here (perhaps
> with a FOR loop).

We already require rm and cp for other purposes. I don't know the
specific details of why, but there is a good reason I think.

Re: "nmake info" Windows patch

[Eli Zaretskii]

> From: Jason Rumney <jasonr@gnu.org>
> Date: 22 Feb 2003 10:13:31 +0000
> 
> We already require rm and cp for other purposes.

What about `mv'--is it required as well?  I think some of the patches
used it.

Re: "nmake info" Windows patch

[Jason Rumney]

"Eli Zaretskii" <eliz@is.elta.co.il> writes:

> > From: Jason Rumney <jasonr@gnu.org>
> > Date: 22 Feb 2003 10:13:31 +0000
> > 
> > We already require rm and cp for other purposes.
> 
> What about `mv'--is it required as well?  I think some of the patches
> used it.

configure.bat only checks for cp and rm.  I don't think there has
been a need for mv in the past.  But if cp and rm are available, it is
likely that mv is also available, since those three usually come
together (in fileutils or baseutils or somesuch package). We should
add a check for it in configure.bat if we need it though.

Re: "nmake info" Windows patch

[Peter 'Luna' Runestig]

Resending the patch by Jason's request. Hope Mozilla doesn't mangle it...

diff -burN emacs-20030219.orig/lispintro/makefile.w32-in emacs-20030219/lispintro/makefile.w32-in
--- emacs-20030219.orig/lispintro/makefile.w32-in	1970-01-01 01:00:00.000000000 +0100
+++ emacs-20030219/lispintro/makefile.w32-in	2003-02-21 21:23:01.000000000 +0100
@@ -0,0 +1,70 @@
+#### Makefile for the Emacs Lisp Introduction manual
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+SHELL = cmd
+
+srcdir = .
+
+infodir = $(srcdir)/../info
+
+INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi
+# The file name eintr must fit within 5 characters, to allow for
+# -NN extensions to fit into DOS 8+3 limits without clashing
+INFO_TARGETS = $(infodir)/eintr
+DVI_TARGETS = emacs-lisp-intro.dvi
+
+MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
+DVIPS = dvips
+ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+
+.SUFFIXES: .dvi .ps .texi
+
+info: $(INFO_TARGETS)
+
+dvi: $(DVI_TARGETS)
+
+$(infodir)/eintr: $(INFO_SOURCES)
+	$(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi
+
+emacs-lisp-intro.dvi: $(INFO_SOURCES)
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi
+
+emacs-lisp-intro.html: $(INFO_SOURCES)
+	$(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi
+
+.dvi.ps:
+	$(DVIPS) $< -o $@
+
+mostlyclean:
+	rm -f  *.log *.cp *.fn *.ky *.pg *.vr *.tp
+
+clean: mostlyclean
+	rm -f *.dvi
+
+distclean: clean
+
+maintainer-clean: distclean
+	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -burN emacs-20030219.orig/lispref/makefile.w32-in emacs-20030219/lispref/makefile.w32-in
--- emacs-20030219.orig/lispref/makefile.w32-in	1970-01-01 01:00:00.000000000 +0100
+++ emacs-20030219/lispref/makefile.w32-in	2003-02-21 21:23:01.000000000 +0100
@@ -0,0 +1,160 @@
+# Makefile for the GNU Emacs Lisp Reference Manual.
+
+# Copyright (C) 1990,1991,1992,1993,1994,1995,1996,1998,1999,2000,2001
+#  Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Standard configure variables.
+srcdir = .
+
+infodir = $(srcdir)/../info
+
+# Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
+# TEX=platex
+TEX=tex
+SHELL=cmd
+INSTALL_INFO = install-info
+MAKEINFO = makeinfo
+
+# The environment variable and its value to add $(srcdir) to the path
+# searched for TeX input files.
+texinputdir = TEXINPUTS=$(srcdir):"$(TEXINPUTS)"
+
+# The name of the manual:
+VERSION=2.9
+manual = elisp-manual-21-$(VERSION)
+
+# Uncomment this line for permuted index.
+# permuted_index = 1
+
+# List of all the texinfo files in the manual:
+
+srcs = \
+  $(srcdir)/abbrevs.texi \
+  $(srcdir)/advice.texi \
+  $(srcdir)/anti.texi \
+  $(srcdir)/back.texi \
+  $(srcdir)/backups.texi \
+  $(srcdir)/buffers.texi \
+  $(srcdir)/calendar.texi \
+  $(srcdir)/commands.texi \
+  $(srcdir)/compile.texi \
+  $(srcdir)/control.texi \
+  $(srcdir)/customize.texi \
+  $(srcdir)/debugging.texi \
+  $(srcdir)/display.texi \
+  $(srcdir)/edebug.texi \
+  $(srcdir)/elisp.texi \
+  $(srcdir)/errors.texi \
+  $(srcdir)/eval.texi \
+  $(srcdir)/files.texi \
+  $(srcdir)/frames.texi \
+  $(srcdir)/functions.texi \
+  $(srcdir)/hash.texi \
+  $(srcdir)/help.texi \
+  $(srcdir)/hooks.texi \
+  $(srcdir)/internals.texi \
+  $(srcdir)/intro.texi \
+  $(srcdir)/keymaps.texi \
+  $(srcdir)/lists.texi \
+  $(srcdir)/loading.texi \
+  $(srcdir)/locals.texi \
+  $(srcdir)/macros.texi \
+  $(srcdir)/maps.texi \
+  $(srcdir)/markers.texi \
+  $(srcdir)/minibuf.texi \
+  $(srcdir)/modes.texi \
+  $(srcdir)/nonascii.texi \
+  $(srcdir)/numbers.texi \
+  $(srcdir)/objects.texi \
+  $(srcdir)/os.texi \
+  $(srcdir)/positions.texi \
+  $(srcdir)/processes.texi \
+  $(srcdir)/searching.texi \
+  $(srcdir)/sequences.texi \
+  $(srcdir)/streams.texi \
+  $(srcdir)/strings.texi \
+  $(srcdir)/symbols.texi \
+  $(srcdir)/syntax.texi \
+  $(srcdir)/text.texi \
+  $(srcdir)/tips.texi \
+  $(srcdir)/variables.texi \
+  $(srcdir)/windows.texi \
+  $(srcdir)/index.unperm \
+  $(srcdir)/index.perm \
+  $(srcdir)/gpl.texi \
+  $(srcdir)/doclicense.texi
+
+
+.PHONY: clean
+
+# The info file is named `elisp'.
+info: $(infodir)/elisp
+
+$(infodir)/elisp: $(srcs) index.texi
+	$(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
+
+elisp.dvi: $(srcs) index.texi
+	# Avoid losing old contents of aux file entirely.
+	-mv elisp.aux elisp.oaux
+	# First shot to define xrefs.
+	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
+	if [ a$(permuted_index) != a ]; \
+	then \
+	  $(srcdir)/permute-index; \
+	  mv permuted.fns elisp.fns; \
+	  texindex elisp.tp; \
+	else \
+	  texindex elisp.??; \
+	fi
+	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
+
+index.texi:
+	  cp $(srcdir)/index.unperm index.texi
+
+install: elisp
+	$(srcdir)/mkinstalldirs $(infodir)
+	cp elisp elisp-* $(infodir)
+	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
+
+clean:
+	rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
+              *.vr *.vrs *.pg *.pgs *.ky *.kys
+	rm -f make.out core
+	rm -f index.texi
+
+distclean: clean
+
+maintainer-clean: clean
+	rm -f elisp elisp-* elisp.dvi elisp.oaux
+
+dist: elisp elisp.dvi
+	-rm -rf temp
+	-mkdir temp
+	-mkdir temp/$(manual)
+	-ln $(srcdir)/README $(srcdir)/configure.in $(srcdir)/configure \
+ $(srcdir)/Makefile.in $(srcdir)/permute-index $(srcs) \
+ $(srcdir)/../man/texinfo.tex \
+ elisp.dvi elisp.aux elisp.??s elisp elisp-[0-9] elisp-[0-9][0-9] \
+ temp/$(manual)
+	-(cd temp/$(manual); rm -f mkinstalldirs)
+	cp $(srcdir)/mkinstalldirs temp/$(manual)
+	(cd temp/$(manual); rm -f *~)
+	(cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
+	-rm -rf temp
diff -burN emacs-20030219.orig/man/makefile.w32-in emacs-20030219/man/makefile.w32-in
--- emacs-20030219.orig/man/makefile.w32-in	1970-01-01 01:00:00.000000000 +0100
+++ emacs-20030219/man/makefile.w32-in	2003-02-21 21:09:42.000000000 +0100
@@ -0,0 +1,295 @@
+#### Makefile for the Emacs Manual and other documentation.
+
+# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001
+#  Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Where to find the source code.  The source code for Emacs's C kernel is
+# expected to be in ${srcdir}/src, and the source code for Emacs's
+# utility programs is expected to be in ${srcdir}/lib-src.  This is
+# set by the configure script's `--srcdir' option.
+srcdir=.
+
+
+# The makeinfo program is part of the Texinfo distribution.
+MAKEINFO = makeinfo
+INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
+	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+		../info/info ../info/message ../info/mh-e ../info/reftex \
+		../info/sc ../info/vip ../info/viper ../info/widget \
+		../info/efaq ../info/ada-mode ../info/autotype ../info/calc \
+		../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
+		../info/woman ../info/emacs-mime ../info/eshell \
+		../info/speedbar ../info/tramp ../info/ses
+DVI_TARGETS = 	emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
+		 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
+		 reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
+		 ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
+		 pcl-cvs.dvi woman.dvi emacs-mime.dvi eshell.dvi \
+		 speedbar.dvi tramp.dvi ses.dvi
+INFOSOURCES = info.texi
+
+# The following rule does not work with all versions of `make'.
+.SUFFIXES: .texi .dvi
+.texi.dvi:
+	texi2dvi $<
+
+TEXI2DVI = texi2dvi
+ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+
+EMACSSOURCES= \
+	$(srcdir)/emacs.texi \
+	$(srcdir)/doclicense.texi \
+	$(srcdir)/screen.texi \
+	$(srcdir)/commands.texi \
+	$(srcdir)/entering.texi \
+	$(srcdir)/basic.texi \
+	$(srcdir)/mini.texi \
+	$(srcdir)/m-x.texi \
+	$(srcdir)/help.texi \
+	$(srcdir)/mark.texi \
+	$(srcdir)/killing.texi \
+	$(srcdir)/regs.texi \
+	$(srcdir)/display.texi \
+	$(srcdir)/search.texi \
+	$(srcdir)/fixit.texi \
+	$(srcdir)/files.texi \
+	$(srcdir)/buffers.texi \
+	$(srcdir)/windows.texi \
+	$(srcdir)/frames.texi \
+	$(srcdir)/mule.texi \
+	$(srcdir)/major.texi \
+	$(srcdir)/indent.texi \
+	$(srcdir)/text.texi \
+	$(srcdir)/programs.texi \
+	$(srcdir)/building.texi \
+	$(srcdir)/maintaining.texi \
+	$(srcdir)/abbrevs.texi \
+	$(srcdir)/picture.texi \
+	$(srcdir)/sending.texi \
+	$(srcdir)/rmail.texi \
+	$(srcdir)/dired.texi \
+	$(srcdir)/calendar.texi \
+	$(srcdir)/misc.texi \
+	$(srcdir)/custom.texi \
+	$(srcdir)/trouble.texi \
+	$(srcdir)/cmdargs.texi \
+	$(srcdir)/xresources.texi \
+	$(srcdir)/anti.texi \
+	$(srcdir)/macos.texi \
+	$(srcdir)/msdog.texi \
+	$(srcdir)/gnu.texi \
+	$(srcdir)/glossary.texi \
+	$(srcdir)/ack.texi
+
+info: $(INFO_TARGETS)
+
+dvi: $(DVI_TARGETS)
+
+# Note that all the Info targets build the Info files
+# in srcdir.  There is no provision for Info files
+# to exist in the build directory.
+# In a distribution of Emacs, the Info files should be up to date.
+
+# The following target uses an explicit -o switch to work around
+# the @setfilename directive in info.texi, which is required for
+# the Texinfo distribution.
+
+../info/info: $(INFOSOURCES)
+	$(MAKEINFO) --no-split info.texi -o $@
+
+info.dvi: $(INFOSOURCES)
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi
+
+../info/emacs: $(EMACSSOURCES)
+	$(MAKEINFO) emacs.texi
+
+emacs.dvi: $(EMACSSOURCES)
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs.texi
+
+# This target is here so you could easily get the list of the *.texi
+# files which belong to the Emacs manual (as opposed to the separate
+# manuals for CL, CC Mode, Ebrowse, etc.).  With this target, you can
+# say things like "grep foo `make emacsman`".
+emacsman:
+	@echo $(EMACSSOURCES)
+
+../info/ccmode: cc-mode.texi
+	$(MAKEINFO) cc-mode.texi
+cc-mode.dvi: cc-mode.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/cc-mode.texi
+
+../info/ada-mode: ada-mode.texi
+	$(MAKEINFO) ada-mode.texi
+ada-mode.dvi: ada-mode.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ada-mode.texi
+
+../info/pcl-cvs: pcl-cvs.texi
+	$(MAKEINFO) pcl-cvs.texi
+pcl-cvs.dvi: pcl-cvs.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/pcl-cvs.texi
+
+../info/eshell: eshell.texi
+	$(MAKEINFO) eshell.texi
+eshell.dvi: eshell.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/eshell.texi
+
+../info/cl: cl.texi
+	$(MAKEINFO) cl.texi
+cl.dvi: cl.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/cl.texi
+
+../info/dired-x: dired-x.texi
+	$(MAKEINFO) dired-x.texi
+dired-x.dvi: dired-x.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/dired-x.texi
+
+../info/ediff: ediff.texi
+	$(MAKEINFO) ediff.texi
+ediff.dvi: ediff.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ediff.texi
+
+../info/forms: forms.texi
+	$(MAKEINFO) forms.texi
+forms.dvi: forms.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/forms.texi
+
+../info/gnus: gnus.texi
+	$(MAKEINFO) gnus.texi
+gnus.dvi: gnus.texi
+	sed -e '/@iflatex/,/@end iflatex/d' $(srcdir)/gnus.texi > gnustmp.texi
+	$(ENVADD) $(TEXI2DVI) gnustmp.texi
+	cp gnustmp.dvi $*.dvi
+	rm gnustmp.*
+
+../info/message: message.texi
+	$(MAKEINFO) message.texi
+message.dvi: message.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/message.texi
+
+../info/mh-e: mh-e.texi
+	$(MAKEINFO) mh-e.texi
+mh-e.dvi: mh-e.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/mh-e.texi
+
+../info/reftex: reftex.texi
+	$(MAKEINFO) reftex.texi
+reftex.dvi: reftex.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/reftex.texi
+
+../info/sc: sc.texi
+	$(MAKEINFO) sc.texi
+sc.dvi: sc.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/sc.texi
+
+../info/vip: vip.texi
+	$(MAKEINFO) vip.texi
+vip.dvi: vip.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/vip.texi
+
+../info/viper: viper.texi
+	$(MAKEINFO) viper.texi
+viper.dvi: viper.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/viper.texi
+
+../info/widget: widget.texi
+	$(MAKEINFO) widget.texi
+widget.dvi: widget.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
+
+../info/efaq: faq.texi
+	$(MAKEINFO) faq.texi
+faq.dvi: faq.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
+
+../etc/GNU: gnu1.texi gnu.texi
+	cd $(srcdir) && makeinfo --no-headers -o ../etc/GNU gnu1.texi
+
+../info/autotype: autotype.texi
+	$(MAKEINFO) autotype.texi
+autotype.dvi: autotype.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi
+
+../info/calc: calc.texi
+	$(MAKEINFO) calc.texi
+
+calc.dvi: calc.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi
+
+# This is produced with --no-split to avoid making files whose
+# names clash on DOS 8+3 filesystems
+../info/idlwave: idlwave.texi
+	$(MAKEINFO) --no-split idlwave.texi
+idlwave.dvi: idlwave.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/idlwave.texi
+
+../info/eudc: eudc.texi
+	$(MAKEINFO) eudc.texi
+eudc.dvi: eudc.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/eudc.texi
+
+../info/ebrowse: ebrowse.texi
+	$(MAKEINFO) ebrowse.texi
+ebrowse.dvi: ebrowse.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ebrowse.texi
+
+../info/woman: woman.texi
+	$(MAKEINFO) woman.texi
+woman.dvi: woman.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/woman.texi
+
+../info/speedbar: speedbar.texi
+	$(MAKEINFO) speedbar.texi
+speedbar.dvi: speedbar.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/speedbar.texi
+
+../info/emacs-mime: emacs-mime.texi
+	$(MAKEINFO) emacs-mime.texi
+emacs-mime.dvi: emacs-mime.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi
+
+../info/tramp: tramp.texi
+	$(MAKEINFO) tramp.texi
+tramp.dvi: tramp.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/tramp.texi
+
+../info/ses: ses.texi
+	$(MAKEINFO) ses.texi
+ses.dvi: ses.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ses.texi
+
+mostlyclean:
+	rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
+
+clean: mostlyclean
+	rm -f *.dvi
+
+distclean: clean
+
+maintainer-clean: distclean
+	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+# Don't delete these, because they are outside the current directory.
+#	for file in $(INFO_TARGETS); do rm -f $${file}*; done
+
+
+# Formerly this directory had texindex.c and getopt.c in it
+# and this makefile built them to make texindex.
+# That caused trouble because this is run entirely in the source directory.
+# Since we expect to get texi2dvi from elsewhere,
+# it is ok to expect texindex from elsewhere also.
diff -burN emacs-20030219.orig/nt/configure.bat emacs-20030219/nt/configure.bat
--- emacs-20030219.orig/nt/configure.bat	2003-02-07 10:04:54.000000000 +0100
+++ emacs-20030219/nt/configure.bat	2003-02-21 21:23:01.000000000 +0100
@@ -433,6 +433,9 @@
 copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile
 copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile
 copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile
+copy /b config.settings+%MAKECMD%.defs+..\man\makefile.w32-in ..\man\makefile
+copy /b config.settings+%MAKECMD%.defs+..\lispref\makefile.w32-in ..\lispref\makefile
+copy /b config.settings+%MAKECMD%.defs+..\lispintro\makefile.w32-in ..\lispintro\makefile
 if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix
 if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile
 copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile
diff -burN emacs-20030219.orig/nt/makefile.w32-in emacs-20030219/nt/makefile.w32-in
--- emacs-20030219.orig/nt/makefile.w32-in	2003-02-07 10:04:54.000000000 +0100
+++ emacs-20030219/nt/makefile.w32-in	2003-02-21 21:23:01.000000000 +0100
@@ -214,6 +214,15 @@
 	$(MAKE) $(MFLAGS) -C ../lisp install
 	$(MAKE) $(MFLAGS) -C ../leim install

+force-info:
+# Note that man/makefile knows how to
+# 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)
+
 #
 # Maintenance
 #

Your Emacs changes

[Richard Stallman]

Now that we have your papers, we can install your changes.  Could you
send your changes once again to emacs-devel, together with change log
entries for them?

Re: Your Emacs changes

[Peter 'Luna' Runestig]

Richard Stallman <rms@gnu.org> writes:
> Now that we have your papers, we can install your changes.  Could you
> send your changes once again to emacs-devel, together with change log
> entries for them?

Here it goes:

diff -burN emacs-cvs-20030817.orig/lispintro/ChangeLog emacs-cvs-20030817/lispintro/ChangeLog
--- emacs-cvs-20030817.orig/lispintro/ChangeLog	2002-02-03 11:15:46.000000000 +0100
+++ emacs-cvs-20030817/lispintro/ChangeLog	2003-08-18 16:27:23.000000000 +0200
@@ -1,3 +1,7 @@
+2003-08-18  Peter Runestig <peter@runestig.com>
+
+	* makefile.w32-in: New file.
+
 2001-11-29  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* emacs-lisp-intro.texi (Index): @ignore extraneous text.
diff -burN emacs-cvs-20030817.orig/lispintro/makefile.w32-in emacs-cvs-20030817/lispintro/makefile.w32-in
--- emacs-cvs-20030817.orig/lispintro/makefile.w32-in	1970-01-01 01:00:00.000000000 +0100
+++ emacs-cvs-20030817/lispintro/makefile.w32-in	2003-08-18 16:22:31.000000000 +0200
@@ -0,0 +1,70 @@
+#### Makefile for the Emacs Lisp Introduction manual
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+SHELL = cmd
+
+srcdir = .
+
+infodir = $(srcdir)/../info
+
+INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi
+# The file name eintr must fit within 5 characters, to allow for
+# -NN extensions to fit into DOS 8+3 limits without clashing
+INFO_TARGETS = $(infodir)/eintr
+DVI_TARGETS = emacs-lisp-intro.dvi
+
+MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
+DVIPS = dvips
+ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+
+.SUFFIXES: .dvi .ps .texi
+
+info: $(INFO_TARGETS)
+
+dvi: $(DVI_TARGETS)
+
+$(infodir)/eintr: $(INFO_SOURCES)
+	$(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi
+
+emacs-lisp-intro.dvi: $(INFO_SOURCES)
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi
+
+emacs-lisp-intro.html: $(INFO_SOURCES)
+	$(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi
+
+.dvi.ps:
+	$(DVIPS) $< -o $@
+
+mostlyclean:
+	rm -f  *.log *.cp *.fn *.ky *.pg *.vr *.tp
+
+clean: mostlyclean
+	rm -f *.dvi
+
+distclean: clean
+
+maintainer-clean: distclean
+	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -burN emacs-cvs-20030817.orig/lispref/ChangeLog emacs-cvs-20030817/lispref/ChangeLog
--- emacs-cvs-20030817.orig/lispref/ChangeLog	2003-08-14 20:28:02.000000000 +0200
+++ emacs-cvs-20030817/lispref/ChangeLog	2003-08-18 16:29:50.000000000 +0200
@@ -1,3 +1,7 @@
+2003-08-18  Peter Runestig <peter@runestig.com>
+
+	* makefile.w32-in: New file.
+
 2003-08-14  John Paul Wallington  <jpw@gnu.org>
 
 	* modes.texi (Emulating Mode Line): Subsection, not section.
diff -burN emacs-cvs-20030817.orig/lispref/makefile.w32-in emacs-cvs-20030817/lispref/makefile.w32-in
--- emacs-cvs-20030817.orig/lispref/makefile.w32-in	1970-01-01 01:00:00.000000000 +0100
+++ emacs-cvs-20030817/lispref/makefile.w32-in	2003-08-18 16:22:31.000000000 +0200
@@ -0,0 +1,160 @@
+# Makefile for the GNU Emacs Lisp Reference Manual.
+
+# Copyright (C) 1990,1991,1992,1993,1994,1995,1996,1998,1999,2000,2001
+#  Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Standard configure variables.
+srcdir = .
+
+infodir = $(srcdir)/../info
+
+# Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
+# TEX=platex
+TEX=tex
+SHELL=cmd
+INSTALL_INFO = install-info
+MAKEINFO = makeinfo
+
+# The environment variable and its value to add $(srcdir) to the path
+# searched for TeX input files.
+texinputdir = TEXINPUTS=$(srcdir):"$(TEXINPUTS)"
+
+# The name of the manual:
+VERSION=2.9
+manual = elisp-manual-21-$(VERSION)
+
+# Uncomment this line for permuted index.
+# permuted_index = 1 
+
+# List of all the texinfo files in the manual:
+
+srcs = \
+  $(srcdir)/abbrevs.texi \
+  $(srcdir)/advice.texi \
+  $(srcdir)/anti.texi \
+  $(srcdir)/back.texi \
+  $(srcdir)/backups.texi \
+  $(srcdir)/buffers.texi \
+  $(srcdir)/calendar.texi \
+  $(srcdir)/commands.texi \
+  $(srcdir)/compile.texi \
+  $(srcdir)/control.texi \
+  $(srcdir)/customize.texi \
+  $(srcdir)/debugging.texi \
+  $(srcdir)/display.texi \
+  $(srcdir)/edebug.texi \
+  $(srcdir)/elisp.texi \
+  $(srcdir)/errors.texi \
+  $(srcdir)/eval.texi \
+  $(srcdir)/files.texi \
+  $(srcdir)/frames.texi \
+  $(srcdir)/functions.texi \
+  $(srcdir)/hash.texi \
+  $(srcdir)/help.texi \
+  $(srcdir)/hooks.texi \
+  $(srcdir)/internals.texi \
+  $(srcdir)/intro.texi \
+  $(srcdir)/keymaps.texi \
+  $(srcdir)/lists.texi \
+  $(srcdir)/loading.texi \
+  $(srcdir)/locals.texi \
+  $(srcdir)/macros.texi \
+  $(srcdir)/maps.texi \
+  $(srcdir)/markers.texi \
+  $(srcdir)/minibuf.texi \
+  $(srcdir)/modes.texi \
+  $(srcdir)/nonascii.texi \
+  $(srcdir)/numbers.texi \
+  $(srcdir)/objects.texi \
+  $(srcdir)/os.texi \
+  $(srcdir)/positions.texi \
+  $(srcdir)/processes.texi \
+  $(srcdir)/searching.texi \
+  $(srcdir)/sequences.texi \
+  $(srcdir)/streams.texi \
+  $(srcdir)/strings.texi \
+  $(srcdir)/symbols.texi \
+  $(srcdir)/syntax.texi \
+  $(srcdir)/text.texi \
+  $(srcdir)/tips.texi \
+  $(srcdir)/variables.texi \
+  $(srcdir)/windows.texi \
+  $(srcdir)/index.unperm \
+  $(srcdir)/index.perm \
+  $(srcdir)/gpl.texi \
+  $(srcdir)/doclicense.texi
+
+
+.PHONY: clean
+
+# The info file is named `elisp'.
+info: $(infodir)/elisp
+
+$(infodir)/elisp: $(srcs) index.texi
+	$(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
+
+elisp.dvi: $(srcs) index.texi
+	# Avoid losing old contents of aux file entirely.
+	-mv elisp.aux elisp.oaux
+	# First shot to define xrefs.
+	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
+	if [ a$(permuted_index) != a ]; \
+	then \
+	  $(srcdir)/permute-index; \
+	  mv permuted.fns elisp.fns; \
+	  texindex elisp.tp; \
+	else \
+	  texindex elisp.??; \
+	fi
+	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
+
+index.texi:
+	  cp $(srcdir)/index.unperm index.texi
+
+install: elisp
+	$(srcdir)/mkinstalldirs $(infodir)
+	cp elisp elisp-* $(infodir)
+	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
+
+clean:
+	rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
+              *.vr *.vrs *.pg *.pgs *.ky *.kys
+	rm -f make.out core 
+	rm -f index.texi
+
+distclean: clean
+
+maintainer-clean: clean
+	rm -f elisp elisp-* elisp.dvi elisp.oaux
+
+dist: elisp elisp.dvi
+	-rm -rf temp
+	-mkdir temp
+	-mkdir temp/$(manual)
+	-ln $(srcdir)/README $(srcdir)/configure.in $(srcdir)/configure \
+ $(srcdir)/Makefile.in $(srcdir)/permute-index $(srcs) \
+ $(srcdir)/../man/texinfo.tex \
+ elisp.dvi elisp.aux elisp.??s elisp elisp-[0-9] elisp-[0-9][0-9] \
+ temp/$(manual)
+	-(cd temp/$(manual); rm -f mkinstalldirs)
+	cp $(srcdir)/mkinstalldirs temp/$(manual)
+	(cd temp/$(manual); rm -f *~)
+	(cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
+	-rm -rf temp
diff -burN emacs-cvs-20030817.orig/man/ChangeLog emacs-cvs-20030817/man/ChangeLog
--- emacs-cvs-20030817.orig/man/ChangeLog	2003-08-17 15:10:56.000000000 +0200
+++ emacs-cvs-20030817/man/ChangeLog	2003-08-18 16:30:30.000000000 +0200
@@ -1,3 +1,7 @@
+2003-08-18  Peter Runestig <peter@runestig.com>
+
+	* makefile.w32-in: New file.
+
 2003-08-17  Alex Schroeder  <alex@gnu.org>
 
 	* misc.texi (Saving Emacs Sessions): Manual M-x desktop-save not
diff -burN emacs-cvs-20030817.orig/man/makefile.w32-in emacs-cvs-20030817/man/makefile.w32-in
--- emacs-cvs-20030817.orig/man/makefile.w32-in	1970-01-01 01:00:00.000000000 +0100
+++ emacs-cvs-20030817/man/makefile.w32-in	2003-08-18 16:22:31.000000000 +0200
@@ -0,0 +1,295 @@
+#### Makefile for the Emacs Manual and other documentation.
+
+# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001
+#  Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Where to find the source code.  The source code for Emacs's C kernel is
+# expected to be in ${srcdir}/src, and the source code for Emacs's
+# utility programs is expected to be in ${srcdir}/lib-src.  This is
+# set by the configure script's `--srcdir' option.
+srcdir=.
+
+
+# The makeinfo program is part of the Texinfo distribution.
+MAKEINFO = makeinfo
+INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
+	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+		../info/info ../info/message ../info/mh-e ../info/reftex \
+		../info/sc ../info/vip ../info/viper ../info/widget \
+		../info/efaq ../info/ada-mode ../info/autotype ../info/calc \
+		../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
+		../info/woman ../info/emacs-mime ../info/eshell \
+		../info/speedbar ../info/tramp ../info/ses
+DVI_TARGETS = 	emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
+		 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
+		 reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
+		 ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
+		 pcl-cvs.dvi woman.dvi emacs-mime.dvi eshell.dvi \
+		 speedbar.dvi tramp.dvi ses.dvi
+INFOSOURCES = info.texi
+
+# The following rule does not work with all versions of `make'.
+.SUFFIXES: .texi .dvi
+.texi.dvi:
+	texi2dvi $<
+
+TEXI2DVI = texi2dvi
+ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" 
+
+EMACSSOURCES= \
+	$(srcdir)/emacs.texi \
+	$(srcdir)/doclicense.texi \
+	$(srcdir)/screen.texi \
+	$(srcdir)/commands.texi \
+	$(srcdir)/entering.texi \
+	$(srcdir)/basic.texi \
+	$(srcdir)/mini.texi \
+	$(srcdir)/m-x.texi \
+	$(srcdir)/help.texi \
+	$(srcdir)/mark.texi \
+	$(srcdir)/killing.texi \
+	$(srcdir)/regs.texi \
+	$(srcdir)/display.texi \
+	$(srcdir)/search.texi \
+	$(srcdir)/fixit.texi \
+	$(srcdir)/files.texi \
+	$(srcdir)/buffers.texi \
+	$(srcdir)/windows.texi \
+	$(srcdir)/frames.texi \
+	$(srcdir)/mule.texi \
+	$(srcdir)/major.texi \
+	$(srcdir)/indent.texi \
+	$(srcdir)/text.texi \
+	$(srcdir)/programs.texi \
+	$(srcdir)/building.texi \
+	$(srcdir)/maintaining.texi \
+	$(srcdir)/abbrevs.texi \
+	$(srcdir)/picture.texi \
+	$(srcdir)/sending.texi \
+	$(srcdir)/rmail.texi \
+	$(srcdir)/dired.texi \
+	$(srcdir)/calendar.texi \
+	$(srcdir)/misc.texi \
+	$(srcdir)/custom.texi \
+	$(srcdir)/trouble.texi \
+	$(srcdir)/cmdargs.texi \
+	$(srcdir)/xresources.texi \
+	$(srcdir)/anti.texi \
+	$(srcdir)/macos.texi \
+	$(srcdir)/msdog.texi \
+	$(srcdir)/gnu.texi \
+	$(srcdir)/glossary.texi \
+	$(srcdir)/ack.texi
+
+info: $(INFO_TARGETS)
+
+dvi: $(DVI_TARGETS)
+
+# Note that all the Info targets build the Info files
+# in srcdir.  There is no provision for Info files
+# to exist in the build directory.
+# In a distribution of Emacs, the Info files should be up to date.
+
+# The following target uses an explicit -o switch to work around
+# the @setfilename directive in info.texi, which is required for
+# the Texinfo distribution.
+
+../info/info: $(INFOSOURCES)
+	$(MAKEINFO) --no-split info.texi -o $@
+
+info.dvi: $(INFOSOURCES)
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi
+
+../info/emacs: $(EMACSSOURCES)
+	$(MAKEINFO) emacs.texi
+
+emacs.dvi: $(EMACSSOURCES)
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs.texi
+
+# This target is here so you could easily get the list of the *.texi
+# files which belong to the Emacs manual (as opposed to the separate
+# manuals for CL, CC Mode, Ebrowse, etc.).  With this target, you can
+# say things like "grep foo `make emacsman`".
+emacsman:
+	@echo $(EMACSSOURCES)
+
+../info/ccmode: cc-mode.texi
+	$(MAKEINFO) cc-mode.texi
+cc-mode.dvi: cc-mode.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/cc-mode.texi
+
+../info/ada-mode: ada-mode.texi
+	$(MAKEINFO) ada-mode.texi
+ada-mode.dvi: ada-mode.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ada-mode.texi
+
+../info/pcl-cvs: pcl-cvs.texi
+	$(MAKEINFO) pcl-cvs.texi
+pcl-cvs.dvi: pcl-cvs.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/pcl-cvs.texi
+
+../info/eshell: eshell.texi
+	$(MAKEINFO) eshell.texi
+eshell.dvi: eshell.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/eshell.texi
+
+../info/cl: cl.texi
+	$(MAKEINFO) cl.texi
+cl.dvi: cl.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/cl.texi
+
+../info/dired-x: dired-x.texi
+	$(MAKEINFO) dired-x.texi
+dired-x.dvi: dired-x.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/dired-x.texi
+
+../info/ediff: ediff.texi
+	$(MAKEINFO) ediff.texi
+ediff.dvi: ediff.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ediff.texi
+
+../info/forms: forms.texi
+	$(MAKEINFO) forms.texi
+forms.dvi: forms.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/forms.texi
+
+../info/gnus: gnus.texi
+	$(MAKEINFO) gnus.texi
+gnus.dvi: gnus.texi
+	sed -e '/@iflatex/,/@end iflatex/d' $(srcdir)/gnus.texi > gnustmp.texi 
+	$(ENVADD) $(TEXI2DVI) gnustmp.texi
+	cp gnustmp.dvi $*.dvi
+	rm gnustmp.*
+
+../info/message: message.texi
+	$(MAKEINFO) message.texi
+message.dvi: message.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/message.texi
+
+../info/mh-e: mh-e.texi
+	$(MAKEINFO) mh-e.texi
+mh-e.dvi: mh-e.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/mh-e.texi
+
+../info/reftex: reftex.texi
+	$(MAKEINFO) reftex.texi
+reftex.dvi: reftex.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/reftex.texi
+
+../info/sc: sc.texi
+	$(MAKEINFO) sc.texi
+sc.dvi: sc.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/sc.texi
+
+../info/vip: vip.texi
+	$(MAKEINFO) vip.texi
+vip.dvi: vip.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/vip.texi
+
+../info/viper: viper.texi
+	$(MAKEINFO) viper.texi
+viper.dvi: viper.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/viper.texi
+
+../info/widget: widget.texi
+	$(MAKEINFO) widget.texi
+widget.dvi: widget.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
+
+../info/efaq: faq.texi
+	$(MAKEINFO) faq.texi
+faq.dvi: faq.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
+
+../etc/GNU: gnu1.texi gnu.texi
+	cd $(srcdir) && makeinfo --no-headers -o ../etc/GNU gnu1.texi
+
+../info/autotype: autotype.texi
+	$(MAKEINFO) autotype.texi
+autotype.dvi: autotype.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi
+
+../info/calc: calc.texi
+	$(MAKEINFO) calc.texi
+
+calc.dvi: calc.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi
+
+# This is produced with --no-split to avoid making files whose
+# names clash on DOS 8+3 filesystems
+../info/idlwave: idlwave.texi
+	$(MAKEINFO) --no-split idlwave.texi
+idlwave.dvi: idlwave.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/idlwave.texi
+
+../info/eudc: eudc.texi
+	$(MAKEINFO) eudc.texi
+eudc.dvi: eudc.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/eudc.texi
+
+../info/ebrowse: ebrowse.texi
+	$(MAKEINFO) ebrowse.texi
+ebrowse.dvi: ebrowse.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ebrowse.texi
+
+../info/woman: woman.texi
+	$(MAKEINFO) woman.texi
+woman.dvi: woman.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/woman.texi
+
+../info/speedbar: speedbar.texi
+	$(MAKEINFO) speedbar.texi
+speedbar.dvi: speedbar.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/speedbar.texi
+
+../info/emacs-mime: emacs-mime.texi
+	$(MAKEINFO) emacs-mime.texi
+emacs-mime.dvi: emacs-mime.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi
+
+../info/tramp: tramp.texi
+	$(MAKEINFO) tramp.texi
+tramp.dvi: tramp.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/tramp.texi
+
+../info/ses: ses.texi
+	$(MAKEINFO) ses.texi
+ses.dvi: ses.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/ses.texi
+
+mostlyclean:
+	rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
+
+clean: mostlyclean
+	rm -f *.dvi
+
+distclean: clean
+
+maintainer-clean: distclean
+	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+# Don't delete these, because they are outside the current directory.
+#	for file in $(INFO_TARGETS); do rm -f $${file}*; done
+
+
+# Formerly this directory had texindex.c and getopt.c in it
+# and this makefile built them to make texindex.
+# That caused trouble because this is run entirely in the source directory.
+# Since we expect to get texi2dvi from elsewhere,
+# it is ok to expect texindex from elsewhere also.
diff -burN emacs-cvs-20030817.orig/nt/ChangeLog emacs-cvs-20030817/nt/ChangeLog
--- emacs-cvs-20030817.orig/nt/ChangeLog	2003-07-10 16:28:04.000000000 +0200
+++ emacs-cvs-20030817/nt/ChangeLog	2003-08-18 16:43:41.000000000 +0200
@@ -1,3 +1,10 @@
+2003-08-18  Peter Runestig <peter@runestig.com>
+
+	* configure.bat: Create ``makefile'' in directories man, lispref and
+	lispintro.
+
+	* makefile.w32-in (force-info, info): New targets.
+
 2003-06-27  Jan D.  <jan.h.d@swipnet.se>
 
 	* config.nt (my_strftime): New define.
diff -burN emacs-cvs-20030817.orig/nt/configure.bat emacs-cvs-20030817/nt/configure.bat
--- emacs-cvs-20030817.orig/nt/configure.bat	2003-02-07 09:04:54.000000000 +0100
+++ emacs-cvs-20030817/nt/configure.bat	2003-08-18 16:22:31.000000000 +0200
@@ -433,6 +433,9 @@
 copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile
 copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile
 copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile
+copy /b config.settings+%MAKECMD%.defs+..\man\makefile.w32-in ..\man\makefile
+copy /b config.settings+%MAKECMD%.defs+..\lispref\makefile.w32-in ..\lispref\makefile
+copy /b config.settings+%MAKECMD%.defs+..\lispintro\makefile.w32-in ..\lispintro\makefile
 if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix
 if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile
 copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile
diff -burN emacs-cvs-20030817.orig/nt/makefile.w32-in emacs-cvs-20030817/nt/makefile.w32-in
--- emacs-cvs-20030817.orig/nt/makefile.w32-in	2003-02-07 09:04:54.000000000 +0100
+++ emacs-cvs-20030817/nt/makefile.w32-in	2003-08-18 16:22:31.000000000 +0200
@@ -214,6 +214,15 @@
 	$(MAKE) $(MFLAGS) -C ../lisp install
 	$(MAKE) $(MFLAGS) -C ../leim install
 
+force-info:
+# Note that man/makefile knows how to
+# 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)
+
 #
 # Maintenance
 #

Re: Your Emacs changes

[Eli Zaretskii]

> From: "Peter 'Luna' Runestig" <peter@runestig.com>
> Date: 18 Aug 2003 17:21:58 +0200
> 
> Richard Stallman <rms@gnu.org> writes:
> > Now that we have your papers, we can install your changes.  Could you
> > send your changes once again to emacs-devel, together with change log
> > entries for them?
> 
> Here it goes:
> [...]

Hmm, bother:

> +SHELL = cmd
> [...]
> +MAKEINFO = makeinfo
> +TEXI2DVI = texi2dvi
> +DVIPS = dvips
> +ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
> [...]
> +mostlyclean:
> +	rm -f  *.log *.cp *.fn *.ky *.pg *.vr *.tp
> +
> +clean: mostlyclean
> +	rm -f *.dvi
> +
> +distclean: clean
> +
> +maintainer-clean: distclean
> +	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc

These patches will probably work only with the Cygwin-compiled ports
of Texinfo and programs such as dvips and rm.  

[There's the fpTeX project which produces native Windows ports of TeX,
DVIware, and related programs, so the assumption that only Cygwin
ports of those programs exist is incorrect.  fpTeX is included on the
annual releases of the "TeX Live" CDROM.]

Also, the Makefile says "SHELL = cmd", but commands such as this:

> +emacs-lisp-intro.dvi: $(INFO_SOURCES)
> +	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi

and this:

> +elisp.dvi: $(srcs) index.texi
> +	# Avoid losing old contents of aux file entirely.
> +	-mv elisp.aux elisp.oaux
> +	# First shot to define xrefs.
> +	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
> +	if [ a$(permuted_index) != a ]; \
> +	then \
> +	  $(srcdir)/permute-index; \
> +	  mv permuted.fns elisp.fns; \
> +	  texindex elisp.tp; \
> +	else \
> +	  texindex elisp.??; \
> +	fi
> +	$(texinputdir) $(TEX) $(srcdir)/elisp.texi

will only work if the shell is actually a port of a Unix shell, such
as Bash, since (AFAIK) CMD doesn't understand the syntax

   "foo=bar some-command"

and also because texi2dvi is a Unix shell script that CMD cannot run
directly, and because "if [ something" will totally confuse CMD.

> +dist: elisp elisp.dvi
> +	-rm -rf temp
> +	-mkdir temp
> +	-mkdir temp/$(manual)
> +	-ln $(srcdir)/README $(srcdir)/configure.in $(srcdir)/configure \
> + $(srcdir)/Makefile.in $(srcdir)/permute-index $(srcs) \
> + $(srcdir)/../man/texinfo.tex \
> + elisp.dvi elisp.aux elisp.??s elisp elisp-[0-9] elisp-[0-9][0-9] \
> + temp/$(manual)
> +	-(cd temp/$(manual); rm -f mkinstalldirs)
> +	cp $(srcdir)/mkinstalldirs temp/$(manual)
> +	(cd temp/$(manual); rm -f *~)
> +	(cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
> +	-rm -rf temp

Since no one will ever prepare an Emacs tarball on Windows, targets
such as this seems unnecessary (it will also not work, since Windows
doesn't support hard links).

Is it really your intent here to allow only Cygwin-compiled ports to
be used?  If so, I'd suggest to say so in some prominent place, since
other makefile-w32.in files (e.g., in the `src' directory) don't make
those assumptions.  (They also take care to use available Windows
commands for operations such as rm, mv and cp.)

Better still, make these Makefiles work with stock Windows shells, if
you are prepared to invest an extra effort.  E.g., the ENVADD stuff
can be replaced with Make's own "export foo=bar" directives.  Or at
least detect that the Makefile is being used with non-Cygwin ports and
refuse to run.

The line "SHELL = CMD" is erroneous in any case, I think.

All these considerations are important especially in the `man'
directory, since the absence of Cygwin ports will prevent people from
building and changing the user manual, which is essential for proper
usage of Emacs.

In any case, thank you for your work.

Re: Your Emacs changes

[Peter 'Luna' Runestig]

On 2003-08-19 09:51, Eli Zaretskii wrote:
[...]
> These patches will probably work only with the Cygwin-compiled ports
> of Texinfo and programs such as dvips and rm.  
> 
> [There's the fpTeX project which produces native Windows ports of TeX,
> DVIware, and related programs, so the assumption that only Cygwin
> ports of those programs exist is incorrect.  fpTeX is included on the
> annual releases of the "TeX Live" CDROM.]

I didn't know that, so this is only tested with Cygwin versions of the
TeX stuff.

> Also, the Makefile says "SHELL = cmd", but commands such as this:
> 
>> +emacs-lisp-intro.dvi: $(INFO_SOURCES)
>> +	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi
> 
> and this:
> 
>> +elisp.dvi: $(srcs) index.texi
>> +	# Avoid losing old contents of aux file entirely.
>> +	-mv elisp.aux elisp.oaux
>> +	# First shot to define xrefs.
>> +	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
>> +	if [ a$(permuted_index) != a ]; \
>> +	then \
>> +	  $(srcdir)/permute-index; \
>> +	  mv permuted.fns elisp.fns; \
>> +	  texindex elisp.tp; \
>> +	else \
>> +	  texindex elisp.??; \
>> +	fi
>> +	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
> 
> will only work if the shell is actually a port of a Unix shell, such
> as Bash, since (AFAIK) CMD doesn't understand the syntax
> 
>    "foo=bar some-command"
> 
> and also because texi2dvi is a Unix shell script that CMD cannot run
> directly, and because "if [ something" will totally confuse CMD.
> 
>> +dist: elisp elisp.dvi
>> +	-rm -rf temp
>> +	-mkdir temp
>> +	-mkdir temp/$(manual)
>> +	-ln $(srcdir)/README $(srcdir)/configure.in $(srcdir)/configure \
>> + $(srcdir)/Makefile.in $(srcdir)/permute-index $(srcs) \
>> + $(srcdir)/../man/texinfo.tex \
>> + elisp.dvi elisp.aux elisp.??s elisp elisp-[0-9] elisp-[0-9][0-9] \
>> + temp/$(manual)
>> +	-(cd temp/$(manual); rm -f mkinstalldirs)
>> +	cp $(srcdir)/mkinstalldirs temp/$(manual)
>> +	(cd temp/$(manual); rm -f *~)
>> +	(cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
>> +	-rm -rf temp
> 
> Since no one will ever prepare an Emacs tarball on Windows, targets
> such as this seems unnecessary (it will also not work, since Windows
> doesn't support hard links).

I based makefile-w32.in on makefile.in, and forgot to clean them up
properly, I should do that. Those targets is probably not normally used,
since I have no problem running this with "nmake info" from CMD.EXE.

On a side note, NTFS does support hard links (AFAIK there's no native
tool for it though, but Cygwin's "ln" works).

-- 
Peter 'Luna' Runestig (fd. Altberg), Sweden <peter@runestig.com>
PGP Key ID: 0xD07BBE13
Fingerprint: 7B5C 1F48 2997 C061 DE4B  42EA CB99 A35C D07B BE13
AOL Instant Messenger Screen name: PRunestig
Yahoo! Messenger profile name: altberg

Re: Your Emacs changes

[Eli Zaretskii]

> Date: Tue, 19 Aug 2003 09:59:08 +0200
> From: "Peter 'Luna' Runestig" <peter@runestig.com>
> > 
> > [There's the fpTeX project which produces native Windows ports of TeX,
> > DVIware, and related programs, so the assumption that only Cygwin
> > ports of those programs exist is incorrect.  fpTeX is included on the
> > annual releases of the "TeX Live" CDROM.]
> 
> I didn't know that, so this is only tested with Cygwin versions of the
> TeX stuff.

I believe that with some caution, we could make it work with native
Windows ports as well.  The ENVADD stuff can be replaced with Make
directirves, and Unixy shell commands can be replaced with more or
less equivalent CMD commands.  Targets such as `dist' should be simply
removed, as they are not needed on Windows.

Colon-separated paths are a PITA, as I don't think Cygwin programs
support semi-colons there.  If indeed they don't, the only way out of
this mess I see is to tell people to edit the resultant Makefile by
hand, as much as I hate that.

> On a side note, NTFS does support hard links (AFAIK there's no native
> tool for it though, but Cygwin's "ln" works).

I knew that, but since native Windows programs don't support links,
their presence in NTFS is currently useless unless one works in a
Cygwin environment.

Re: "nmake info" Windows patch (was: Your Emacs changes)

[Peter 'Luna' Runestig]

On 2003-08-19 19:46, Eli Zaretskii wrote:
>> Date: Tue, 19 Aug 2003 09:59:08 +0200
>> From: "Peter 'Luna' Runestig" <peter@runestig.com>
>> I didn't know that, so this is only tested with Cygwin versions of the
>> TeX stuff.
> 
> I believe that with some caution, we could make it work with native
> Windows ports as well.  The ENVADD stuff can be replaced with Make
> directirves, and Unixy shell commands can be replaced with more or
> less equivalent CMD commands.  Targets such as `dist' should be simply
> removed, as they are not needed on Windows.
> 
> Colon-separated paths are a PITA, as I don't think Cygwin programs
> support semi-colons there.  If indeed they don't, the only way out of
> this mess I see is to tell people to edit the resultant Makefile by
> hand, as much as I hate that.

All this Windows-incompatible stuff in the new makefiles I created, is
related to building DVI files, not INFO files. So, how should I do this:
rip out all non-INFO related stuff, or also make DVI building work (if I
can find a Windows port of texi2dvi...)?

>> On a side note, NTFS does support hard links (AFAIK there's no native
>> tool for it though, but Cygwin's "ln" works).
> 
> I knew that, but since native Windows programs don't support links,
> their presence in NTFS is currently useless unless one works in a
> Cygwin environment.

As long as you have a "ln" tool, which doesn't need to come from Cygwin,
they are still quite useful.

Cheers,
- Peter
-- 
Peter 'Luna' Runestig (fd. Altberg), Sweden <peter@runestig.com>
PGP Key ID: 0xD07BBE13
Fingerprint: 7B5C 1F48 2997 C061 DE4B  42EA CB99 A35C D07B BE13
AOL Instant Messenger Screen name: PRunestig
Yahoo! Messenger profile name: altberg

Re: "nmake info" Windows patch (was: Your Emacs changes)

[Eli Zaretskii]

> Date: Fri, 29 Aug 2003 09:25:16 +0200
> From: "Peter 'Luna' Runestig" <peter@runestig.com>
> 
> All this Windows-incompatible stuff in the new makefiles I created, is
> related to building DVI files, not INFO files.  So, how should I do this:
> rip out all non-INFO related stuff, or also make DVI building work (if I
> can find a Windows port of texi2dvi...)?

Are you saying that you don't really care about the parts that produce
Info files, only about the DVI stuff?  I'd say that Windows users
should be able to produce the on-line Info manuals as well, but if you
cannot work on that, I guess they won't be able to do that.

In any case, IMHO, fix those parts of the Makefile's that you can, and
leave the rest unmodified, don't remove them.  Someone else will then
hopefully pick up where you left off.  A comment in the Makefile's to
the effect that only some of the targets work reliably would be a good
idea.

> >> On a side note, NTFS does support hard links (AFAIK there's no native
> >> tool for it though, but Cygwin's "ln" works).
> > 
> > I knew that, but since native Windows programs don't support links,
> > their presence in NTFS is currently useless unless one works in a
> > Cygwin environment.
> 
> As long as you have a "ln" tool, which doesn't need to come from Cygwin,
> they are still quite useful.

What other packages besides Cygwin offer a port of `ln'?

Re: "nmake info" Windows patch

[Peter 'Luna' Runestig]

On 2003-08-29 13:20, Eli Zaretskii wrote:
>> Date: Fri, 29 Aug 2003 09:25:16 +0200
>> From: "Peter 'Luna' Runestig" <peter@runestig.com>
>> 
>> All this Windows-incompatible stuff in the new makefiles I created, is
>> related to building DVI files, not INFO files.  So, how should I do this:
>> rip out all non-INFO related stuff, or also make DVI building work (if I
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-- !!!

>> can find a Windows port of texi2dvi...)?
> 
> Are you saying that you don't really care about the parts that produce
> Info files, only about the DVI stuff?  I'd say that Windows users
> should be able to produce the on-line Info manuals as well, but if you
> cannot work on that, I guess they won't be able to do that.

No, I'm saying the opposite. I started out, offering a patch that adds
"info" as a useable make target to the Windows port, for the first time
pretty precise a year ago. I recently posted it again when my copyright
assignment paper to FSF was cleared. Then comments were made on stuff in
the new makefiles I introduced, that didn't work on the Windows
platform. All those comments were about targets in the makefiles, that
wasn't used by the "info" targets, but were left in there by me anyway
(I used the unix makefile.in's as templates). So I'm now wondering, what
you guys want me to do about it, so this patch can go into the sources.

All I want is a working "info" make target.

>> > I knew that, but since native Windows programs don't support links,
>> > their presence in NTFS is currently useless unless one works in a
>> > Cygwin environment.
>> 
>> As long as you have a "ln" tool, which doesn't need to come from Cygwin,
>> they are still quite useful.
> 
> What other packages besides Cygwin offer a port of `ln'?

No idea, I just don't agree on that the NTFS support for hard link is
"useless".

Cheers,
- Peter
-- 
Peter 'Luna' Runestig (fd. Altberg), Sweden <peter@runestig.com>
PGP Key ID: 0xD07BBE13
Fingerprint: 7B5C 1F48 2997 C061 DE4B  42EA CB99 A35C D07B BE13
AOL Instant Messenger Screen name: PRunestig
Yahoo! Messenger profile name: altberg

Re: "nmake info" Windows patch

[Eli Zaretskii]

> Date: Fri, 29 Aug 2003 13:35:40 +0200
> From: "Peter 'Luna' Runestig" <peter@runestig.com>
> 
> So I'm now wondering, what
> you guys want me to do about it, so this patch can go into the sources.
> 
> All I want is a working "info" make target.

If you can fix the targets that use Unix features, please do.  If not,
I personally have no objections to leave them as they are provided
that a comment to the effect that they won't work reliably is added to
the Makefile's and/or to nt/README.

Thanks.

Re: "nmake info" Windows patch

[Richard Stallman]

    No, I'm saying the opposite. I started out, offering a patch that adds
    "info" as a useable make target to the Windows port, for the first time
    pretty precise a year ago...

    All I want is a working "info" make target.

That would certainly be an improvement.  If it is really hard to do
this 100% right, it would be better to make this work in some cases
than let it work in none.