# HG changeset patch
# User Vin Shelton <acs@xemacs.org>
# Date 1322575536 18000
# Node ID 2b2f37e84792bb91a5b974280235fd2743ed1a7f
# Parent  c9e5612f542425f03f595a55cb03dce1a2b7886a
Fixes for building native windows setup kits

diff -r c9e5612f5424 -r 2b2f37e84792 nt/ChangeLog
--- a/nt/ChangeLog	Sat Nov 26 17:59:14 2011 +0000
+++ b/nt/ChangeLog	Tue Nov 29 09:05:36 2011 -0500
@@ -1,3 +1,8 @@
+2011-11-28  Vin Shelton  <acs@xemacs.org>
+
+	* config.inc.samp: Update version number for png, zlib, jpeg and tiff.
+	* xemacs.mak: Add rules for building texinfo.info.
+
 2011-04-29  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.31 "ginger" is released.
diff -r c9e5612f5424 -r 2b2f37e84792 nt/config.inc.samp
--- a/nt/config.inc.samp	Sat Nov 26 17:59:14 2011 +0000
+++ b/nt/config.inc.samp	Tue Nov 29 09:05:36 2011 -0500
@@ -77,20 +77,20 @@
 # have to rename the zlib directory to just `zlib'.  We don't do that here
 # so we can preserve the version number, like for the other libraries.
 HAVE_PNG=1
-PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.8
-ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib-1.2.3
+PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.46
+ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib
 
 # Set this to enable JPEG support (useful, but not necessary), and specify
 # the directory containing jpeg.  Get the latest version from
 # http://www.ijg.org/ or ftp://ftp.uu.net/graphics/jpeg/.
 HAVE_JPEG=1
-JPEG_DIR=$(OPTIONAL_LIBRARY_DIR)\jpeg-6b
+JPEG_DIR=$(OPTIONAL_LIBRARY_DIR)\jpeg-8c
 
 # Set this to enable TIFF support (not very important), and specify the
 # directory containing tiff.  Get the latest version from
 # http://www.remotesensing.org/libtiff/.
 HAVE_TIFF=1
-TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-3.7.3
+TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-3.9.5
 
 # Set this to enable XFace support (not very important), and specify the
 # directory containing compface.  Get the library from
diff -r c9e5612f5424 -r 2b2f37e84792 nt/xemacs.mak
--- a/nt/xemacs.mak	Sat Nov 26 17:59:14 2011 +0000
+++ b/nt/xemacs.mak	Tue Nov 29 09:05:36 2011 -0500
@@ -1630,6 +1630,14 @@
 	$(MANDIR)\new-users-guide\region.texi \
 	$(MANDIR)\new-users-guide\search.texi \
 	$(MANDIR)\new-users-guide\xmenu.texi
+	
+TEXINFO_SRCS = \
+	$(MANDIR)\texinfo\texinfo.texi \
+	$(MANDIR)\texinfo\version.texi
+	
+$(INFODIR)\texinfo.info: $(TEXINFO_SRCS)
+	cd $(MANDIR)\texinfo
+	$(MAKEINFO) texinfo.texi
 
 $(INFODIR)\xemacs.info: $(XEMACS_SRCS)
 	cd $(MANDIR)\xemacs