Tweak Woe32 support.

diff --git a/gettext-tools/libuniname/Makefile.msvc b/gettext-tools/libuniname/Makefile.msvc
index 119c9a8db6a91c955907c59bbd89e690bfd72c73..173eeb91221abcd505d774a998383b4a473b5814 100644 (file)
--- a/gettext-tools/libuniname/Makefile.msvc
+++ b/gettext-tools/libuniname/Makefile.msvc
@@ -49,7 +49,7 @@ OPTIMFLAGS = -D_NDEBUG -O1
 
 CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H
 
-INCLUDES =
+INCLUDES = -I.. -I..\lib -I..\windows
 
 AR = lib
 AR_FLAGS = /out:

diff --git a/gettext-tools/po/Makefile.msvc.sh b/gettext-tools/po/Makefile.msvc.sh
index 6e43ffc6552434aaf4274595a917842e2906888a..b0abb5a57f385de223d4361877a30778753003fe 100755 (executable)
--- a/gettext-tools/po/Makefile.msvc.sh
+++ b/gettext-tools/po/Makefile.msvc.sh
@@ -39,9 +39,9 @@ for cat in $catalogs; do
   cat=`basename $cat`
   lang=`echo $cat | sed -e 's/\.gmo$//'`
 cat <<EOF
-       -mkdir \$(localedir)\\${cat}
-       -mkdir \$(localedir)\\${cat}\\LC_MESSAGES
-       \$(INSTALL_DATA) ${cat}.gmo \$(localedir)\\${cat}\\LC_MESSAGES\\${domain}.mo
+       -mkdir \$(localedir)\\${lang}
+       -mkdir \$(localedir)\\${lang}\\LC_MESSAGES
+       \$(INSTALL_DATA) ${lang}.gmo \$(localedir)\\${lang}\\LC_MESSAGES\\${domain}.mo
 EOF
 done
 cat <<\EOF
@@ -55,8 +55,8 @@ for cat in $catalogs; do
   cat=`basename $cat`
   lang=`echo $cat | sed -e 's/\.gmo$//'`
 cat <<EOF
-       -mkdir \$(localedir)\\${cat}
-       -mkdir \$(localedir)\\${cat}\\LC_MESSAGES
+       -mkdir \$(localedir)\\${lang}
+       -mkdir \$(localedir)\\${lang}\\LC_MESSAGES
 EOF
 done
 cat <<\EOF
@@ -67,7 +67,7 @@ for cat in $catalogs; do
   cat=`basename $cat`
   lang=`echo $cat | sed -e 's/\.gmo$//'`
 cat <<EOF
-       \$(RM) \$(localedir)\\${cat}\\LC_MESSAGES\\${domain}.mo
+       \$(RM) \$(localedir)\\${lang}\\LC_MESSAGES\\${domain}.mo
 EOF
 done
 cat <<\EOF