More fixes for Windows build.

Author: bhaible

ChangeLog

@@ -1,3 +1,20 @@
+2003-05-08  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.msvc (IIPREFIX): New variable.
+	* srclib/Makefile.msvc (INCLUDES): Add -I..\windows.
+	* src/Makefile.msvc (IIPREFIX, IIprefix, IIexec_prefix, IIbindir,
+	IIincludedir): New variables.
+	(INCLUDES): Add -I..\windows.
+	(iconv.exe): Define INSTALLPREFIX and INSTALLDIR.
+	Patches by Perry Rapp.
+
+2003-05-07  Bruno Haible  <bruno@clisp.org>
+
+	* README.woe32: Fix instructions for step 1.
+	* srclib/Makefile.msvc (OBJECTS): Remove strtoul.obj.
+	(strtoul.obj): Remove rule.
+	Reported by Perry Rapp.
+
 2003-05-07  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.vms: New file.

Makefile.msvc

@@ -11,7 +11,8 @@
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
 #   NO_NLS=1  do not use Native Language Support
-#   PREFIX=Some\Directory   Base directory for installation
+#   PREFIX=Some\Directory       Base directory for installation
+#   IIPREFIX=Some\\Directory    Same thing with doubled backslashes
 # Note that nmake command line flags are automatically passed to subdirectory
 # Makefiles. Therefore we don't need to pass them explicitly to subdirectory
 # Makefiles, but the subdirectory Makefiles need to have the same defaults.
@@ -34,6 +35,9 @@ NO_NLS=0
 !if !defined(PREFIX)
 PREFIX = c:\usr
 !endif
+!if !defined(IIPREFIX)
+IIPREFIX = c:\\usr
+!endif
 
 # Directories used by "make install":
 prefix = $(PREFIX)

src/Makefile.msvc

@@ -11,7 +11,8 @@
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
 #   NO_NLS=1  do not use Native Language Support
-#   PREFIX=Some\Directory   Base directory for installation
+#   PREFIX=Some\Directory       Base directory for installation
+#   IIPREFIX=Some\\Directory    Same thing with doubled backslashes
 !if !defined(DLL)
 DLL=0
 !endif
@@ -31,6 +32,9 @@ NO_NLS=0
 !if !defined(PREFIX)
 PREFIX = c:\usr
 !endif
+!if !defined(IIPREFIX)
+IIPREFIX = c:\\usr
+!endif
 
 !if $(DEBUG)
 OPTIMFLAGS = -Od -Z7
@@ -61,11 +65,15 @@ prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 includedir = $(prefix)\include
+IIprefix = $(IIPREFIX)
+IIexec_prefix = $(IIprefix)
+IIbindir = $(IIexec_prefix)\\bin
+IIincludedir = $(IIprefix)\\include
 
 # Programs used by "make":
 CC = cl
 CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) $(NLSFLAGS)
-INCLUDES = -I. -I.. -I..\include -I..\srclib $(INCINTL)
+INCLUDES = -I. -I.. -I..\include -I..\srclib -I..\windows $(INCINTL)
 RM = -del
 
 # Programs used by "make install":
@@ -80,7 +88,7 @@ SHELL = /bin/sh
 all : iconv.exe
 
 iconv.exe : $(srcdir)/iconv.c ../lib/iconv.lib
-	$(CC) $(INCLUDES) -I..\lib $(CFLAGS) $(srcdir)/iconv.c $(LIBINTL) ../lib/iconv.lib -Feiconv.exe
+	$(CC) $(INCLUDES) -I..\lib $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" $(srcdir)/iconv.c $(LIBINTL) ../lib/iconv.lib -Feiconv.exe
 	$(RM) iconv.obj
 !if $(DLL)
 	copy ..\lib\iconv.dll iconv.dll

srclib/Makefile.msvc

@@ -66,7 +66,7 @@ LIBINTL = $(libdir)\intl.lib
 
 CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H $(NLSFLAGS) -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
 
-INCLUDES = -I. -I.. $(INCINTL)
+INCLUDES = -I. -I.. -I..\windows $(INCINTL)
 
 AR = lib
 AR_FLAGS = /out:
@@ -86,7 +86,6 @@ SHELL = /bin/sh
 OBJECTS = \
   error.obj \
   progname.obj progreloc.obj \
-  strtoul.obj \
   xmalloc.obj xstrdup.obj \
   \
   relocatable.obj \
@@ -103,9 +102,6 @@ progname.obj : progname.c
 progreloc.obj : progreloc.c
 	$(CC) $(INCLUDES) $(CFLAGS) -c progreloc.c
 
-strtoul.obj : strtoul.c
-	$(CC) $(INCLUDES) $(CFLAGS) -c strtoul.c
-
 xmalloc.obj : xmalloc.c
 	$(CC) $(INCLUDES) $(CFLAGS) -c xmalloc.c