Tweaks for Woe32 portability.

Author: bhaible

ChangeLog

@@ -1,3 +1,13 @@
+2003-05-17  Bruno Haible  <bruno@clisp.org>
+
+	* src/Makefile.msvc (libdir, datadir, localedir): New variables.
+	(IIlibdir, IIdatadir, IIlocaledir): New variables.
+	(CFLAGS): Define LOCALEDIR.
+	(iconv_no_i18n.exe): New rule.
+	(all): Depend on it.
+	* tests/check-stateful.bat: Invoke iconv_no_i18n instead of iconv.
+	* tests/check-translit.bat: Likewise.
+
 2003-05-16  Bruno Haible  <bruno@clisp.org>
 
 	* lib/genaliases.c (main): Emit declarations for gperf-3.0.

src/Makefile.msvc

@@ -64,15 +64,21 @@ srcdir = .
 prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
+libdir = $(exec_prefix)\lib
 includedir = $(prefix)\include
+datadir = $(prefix)\share
+localedir = $(datadir)\locale
 IIprefix = $(IIPREFIX)
 IIexec_prefix = $(IIprefix)
 IIbindir = $(IIexec_prefix)\\bin
+IIlibdir = $(IIexec_prefix)\\lib
 IIincludedir = $(IIprefix)\\include
+IIdatadir = $(IIprefix)\\share
+IIlocaledir = $(IIdatadir)\\locale
 
 # Programs used by "make":
 CC = cl
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) $(NLSFLAGS)
+CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) $(NLSFLAGS) -DLOCALEDIR=\"$(IIlocaledir)\"
 INCLUDES = -I. -I.. -I..\include -I..\srclib -I..\windows $(INCINTL)
 RM = -del
 
@@ -85,7 +91,15 @@ INSTALL_DATA = copy
 
 SHELL = /bin/sh
 
-all : iconv.exe
+all : iconv_no_i18n.exe iconv.exe
+
+# This is the temporary iconv executable, without internationalization.
+iconv_no_i18n.exe : $(srcdir)/iconv_no_i18n.c $(srcdir)/iconv.c ../srclib/icrt.lib ../lib/iconv.lib
+	$(CC) $(INCLUDES) -I..\lib $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" $(srcdir)/iconv_no_i18n.c ../srclib/icrt.lib ../lib/iconv.lib -Feiconv_no_i18n.exe
+	$(RM) iconv_no_i18n.obj
+!if $(DLL)
+	copy ..\lib\iconv.dll iconv.dll
+!endif
 
 iconv.exe : $(srcdir)/iconv.c ../srclib/icrt.lib ../lib/iconv.lib
 	$(CC) $(INCLUDES) -I..\lib $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" $(srcdir)/iconv.c ../srclib/icrt.lib $(LIBINTL) ../lib/iconv.lib -Feiconv.exe

tests/check-stateful.bat

@@ -2,8 +2,8 @@
 REM Simple check of a stateful encoding.
 REM Usage: check-stateful.bat SRCDIR CHARSET
 
-..\src\iconv --binary -f %2 -t UTF-8 < %1\%2-snippet > tmp-snippet
+..\src\iconv_no_i18n --binary -f %2 -t UTF-8 < %1\%2-snippet > tmp-snippet
 fc %1\%2-snippet.UTF-8 tmp-snippet
-..\src\iconv --binary -f UTF-8 -t %2 < %1\%2-snippet.UTF-8 > tmp-snippet
+..\src\iconv_no_i18n --binary -f UTF-8 -t %2 < %1\%2-snippet.UTF-8 > tmp-snippet
 fc %1\%2-snippet tmp-snippet
 del tmp-snippet

tests/check-translit.bat

@@ -2,6 +2,6 @@
 REM Simple check of transliteration facilities.
 REM Usage: check-translit.bat SRCDIR FILE FROMCODE TOCODE
 
-..\src\iconv --binary -f %3 -t %4//TRANSLIT < %1\%2.%3 > tmp
+..\src\iconv_no_i18n --binary -f %3 -t %4//TRANSLIT < %1\%2.%3 > tmp
 fc %1\%2.%4 tmp
 del tmp