The customizable variable must be called $(PREFIX), not $(prefix), because

nmake cannot pass lowercase variable names to subdirectories.

diff --git a/Makefile.msvc b/Makefile.msvc
index c5513e02ff5aaffc2d3718192894d0f91127113e..a5feeac165e3901a72a23723b978d15a2d017240 100644 (file)
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -10,6 +10,8 @@
 #     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
+#   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.
@@ -26,9 +28,15 @@ MFLAGS=
 MFLAGS=-MD
 !endif
 !endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+!if !defined(IIPREFIX)
+IIPREFIX = c:\\usr
+!endif
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 libdir = $(exec_prefix)\lib

diff --git a/gettext-runtime/Makefile.msvc b/gettext-runtime/Makefile.msvc
index 727043119166aab3dfad092f313c981fe14169fe..40319b01809dd0b3269f8942a61862d5c9a41dba 100644 (file)
--- a/gettext-runtime/Makefile.msvc
+++ b/gettext-runtime/Makefile.msvc
@@ -10,6 +10,8 @@
 #     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
+#   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.
@@ -26,9 +28,15 @@ MFLAGS=
 MFLAGS=-MD
 !endif
 !endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+!if !defined(IIPREFIX)
+IIPREFIX = c:\\usr
+!endif
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 libdir = $(exec_prefix)\lib

diff --git a/gettext-runtime/intl/Makefile.msvc b/gettext-runtime/intl/Makefile.msvc
index 69f77220c02916ce19983b8686ad3f07b1a677fa..779c1f91e632f60976298ee8e183101379d4e731 100644 (file)
--- a/gettext-runtime/intl/Makefile.msvc
+++ b/gettext-runtime/intl/Makefile.msvc
@@ -10,6 +10,8 @@
 #     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
+#   PREFIX=Some\Directory       Base directory for installation
+#   IIPREFIX=Some\\Directory    Same thing with doubled backslashes
 !if !defined(DLL)
 DLL=0
 !endif
@@ -23,12 +25,18 @@ MFLAGS=
 MFLAGS=-MD
 !endif
 !endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+!if !defined(IIPREFIX)
+IIPREFIX = c:\\usr
+!endif
 
 # Directories used by "make":
 srcdir = .
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 libdir = $(exec_prefix)\lib
@@ -36,7 +44,7 @@ includedir = $(prefix)\include
 datadir = $(prefix)\share
 localedir = $(datadir)\locale
 aliaspath =
-IIprefix = c:\\usr
+IIprefix = $(IIPREFIX)
 IIexec_prefix = $(IIprefix)
 IIbindir = $(IIexec_prefix)\\bin
 IIlibdir = $(IIexec_prefix)\\lib

diff --git a/gettext-runtime/lib/Makefile.msvc b/gettext-runtime/lib/Makefile.msvc
index 404ce00392580eef9133cd665638cb0a9a7dc60d..e7a68d617f7ca780b41fb46903fdc00ff1a5c836 100644 (file)
--- a/gettext-runtime/lib/Makefile.msvc
+++ b/gettext-runtime/lib/Makefile.msvc
@@ -8,15 +8,19 @@
 #     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
+#   PREFIX=Some\Directory   Base directory for installation
 !if !defined(DEBUG)
 DEBUG=0
 !endif
 !if !defined(MFLAGS)
 MFLAGS=
 !endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 includedir = $(prefix)\include
 
 # Programs used by "make":

diff --git a/gettext-runtime/libasprintf/Makefile.msvc b/gettext-runtime/libasprintf/Makefile.msvc
index 6c0f511cb8eeb94b5aff8ed0cdb4efa17c3b3385..6119e829af7a7e687f3fe1afea3b56fd2b79341a 100644 (file)
--- a/gettext-runtime/libasprintf/Makefile.msvc
+++ b/gettext-runtime/libasprintf/Makefile.msvc
@@ -10,6 +10,7 @@
 #     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
+#   PREFIX=Some\Directory   Base directory for installation
 # 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.
@@ -26,9 +27,12 @@ MFLAGS=
 MFLAGS=-MD
 !endif
 !endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 libdir = $(exec_prefix)\lib

diff --git a/gettext-runtime/man/Makefile.msvc b/gettext-runtime/man/Makefile.msvc
index 2d27ba824507ab7a7cf63c9b225f69a0dec8aee7..7ef708ec8cbfbd5f2d46013744c539e3f5f7b325 100644 (file)
--- a/gettext-runtime/man/Makefile.msvc
+++ b/gettext-runtime/man/Makefile.msvc
@@ -2,8 +2,14 @@
 
 #### Start of system configuration section. ####
 
+# Flags that can be set on the nmake command line:
+#   PREFIX=Some\Directory   Base directory for installation
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 mandir = $(prefix)\man
 man1dir = $(mandir)\man1
 man3dir = $(mandir)\man3

diff --git a/gettext-runtime/po/Makefile.msvc.sh b/gettext-runtime/po/Makefile.msvc.sh
index b0abb5a57f385de223d4361877a30778753003fe..d2cc583d6f069ed083182db8c71e1df9c0656ca9 100755 (executable)
--- a/gettext-runtime/po/Makefile.msvc.sh
+++ b/gettext-runtime/po/Makefile.msvc.sh
@@ -8,11 +8,17 @@ cat <<\EOF
 
 #### Start of system configuration section. ####
 
+# Flags that can be set on the nmake command line:
+#   PREFIX=Some\Directory   Base directory for installation
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+
 # Directories used by "make":
 srcdir = .
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 datadir = $(prefix)\share
 localedir = $(datadir)\locale
 

diff --git a/gettext-runtime/src/Makefile.msvc b/gettext-runtime/src/Makefile.msvc
index 28d6456af4db3a4e4c972ced11e9967471234be1..dd8b6c6f6ab6263d8e0a778562979f79632a50d0 100644 (file)
--- a/gettext-runtime/src/Makefile.msvc
+++ b/gettext-runtime/src/Makefile.msvc
@@ -10,6 +10,8 @@
 #     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
+#   PREFIX=Some\Directory       Base directory for installation
+#   IIPREFIX=Some\\Directory    Same thing with doubled backslashes
 !if !defined(DLL)
 DLL=0
 !endif
@@ -23,14 +25,20 @@ MFLAGS=
 MFLAGS=-MD
 !endif
 !endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+!if !defined(IIPREFIX)
+IIPREFIX = c:\\usr
+!endif
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 datadir = $(prefix)\share
 localedir = $(datadir)\locale
-IIprefix = c:\\usr
+IIprefix = $(IIPREFIX)
 IIexec_prefix = $(IIprefix)
 IIbindir = $(IIexec_prefix)\\bin
 IIdatadir = $(IIprefix)\\share

diff --git a/gettext-tools/Makefile.msvc b/gettext-tools/Makefile.msvc
index a0e291610b6ee95bf1bc820e18440e12eb8c77d3..3b12cf0f8d021fe51422aff99b7057951d9b7ba1 100644 (file)
--- a/gettext-tools/Makefile.msvc
+++ b/gettext-tools/Makefile.msvc
@@ -10,6 +10,8 @@
 #     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
+#   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.
@@ -26,9 +28,15 @@ MFLAGS=
 MFLAGS=-MD
 !endif
 !endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+!if !defined(IIPREFIX)
+IIPREFIX = c:\\usr
+!endif
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 libdir = $(exec_prefix)\lib

diff --git a/gettext-tools/doc/Makefile.msvc b/gettext-tools/doc/Makefile.msvc
index 04d79f2b5434afc759deb74f45f497ef5440939f..13f7612bbf4448d8c4715ff70b1366e3ae4211e0 100644 (file)
--- a/gettext-tools/doc/Makefile.msvc
+++ b/gettext-tools/doc/Makefile.msvc
@@ -2,8 +2,14 @@
 
 #### Start of system configuration section. ####
 
+# Flags that can be set on the nmake command line:
+#   PREFIX=Some\Directory   Base directory for installation
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 docdir = $(prefix)\doc\gettext
 
 LN = copy

diff --git a/gettext-tools/lib/Makefile.msvc b/gettext-tools/lib/Makefile.msvc
index b49a2b72b9031021d09307e6b72235363d9ff776..8fe5eb204293c54a62fc33e546f69821271a3b35 100644 (file)
--- a/gettext-tools/lib/Makefile.msvc
+++ b/gettext-tools/lib/Makefile.msvc
@@ -10,6 +10,7 @@
 #     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
+#   PREFIX=Some\Directory   Base directory for installation
 !if !defined(DLL)
 DLL=0
 !endif
@@ -23,9 +24,12 @@ MFLAGS=
 MFLAGS=-MD
 !endif
 !endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 libdir = $(exec_prefix)\lib

diff --git a/gettext-tools/man/Makefile.msvc b/gettext-tools/man/Makefile.msvc
index 8746e55239ac3510d724e9add60b4d03e37b2724..138a6b7f122132589bd272cf8f72a0f3d6fef3f1 100644 (file)
--- a/gettext-tools/man/Makefile.msvc
+++ b/gettext-tools/man/Makefile.msvc
@@ -2,8 +2,14 @@
 
 #### Start of system configuration section. ####
 
+# Flags that can be set on the nmake command line:
+#   PREFIX=Some\Directory   Base directory for installation
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 mandir = $(prefix)\man
 man1dir = $(mandir)\man1
 docdir = $(prefix)\doc\gettext

diff --git a/gettext-tools/misc/Makefile.msvc b/gettext-tools/misc/Makefile.msvc
index c4627049f5346331b76798c13c71ecdcd3b804ca..3286fe2a0abe52203d4c54f5a9d22f1d84afd360 100644 (file)
--- a/gettext-tools/misc/Makefile.msvc
+++ b/gettext-tools/misc/Makefile.msvc
@@ -2,8 +2,14 @@
 
 #### Start of system configuration section. ####
 
+# Flags that can be set on the nmake command line:
+#   PREFIX=Some\Directory   Base directory for installation
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 exec_prefix = $(prefix)
 datadir = $(prefix)\share
 emacsdir = $(datadir)\emacs

diff --git a/gettext-tools/po/Makefile.msvc.sh b/gettext-tools/po/Makefile.msvc.sh
index b0abb5a57f385de223d4361877a30778753003fe..d2cc583d6f069ed083182db8c71e1df9c0656ca9 100755 (executable)
--- a/gettext-tools/po/Makefile.msvc.sh
+++ b/gettext-tools/po/Makefile.msvc.sh
@@ -8,11 +8,17 @@ cat <<\EOF
 
 #### Start of system configuration section. ####
 
+# Flags that can be set on the nmake command line:
+#   PREFIX=Some\Directory   Base directory for installation
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+
 # Directories used by "make":
 srcdir = .
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 datadir = $(prefix)\share
 localedir = $(datadir)\locale
 

diff --git a/gettext-tools/src/Makefile.msvc b/gettext-tools/src/Makefile.msvc
index c9c492d5bccb52769b594a0cc56991158694c314..d776e00b8a7df4b755a1ef2d453c41b9ed8888b4 100644 (file)
--- a/gettext-tools/src/Makefile.msvc
+++ b/gettext-tools/src/Makefile.msvc
@@ -10,6 +10,8 @@
 #     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
 #     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
 #   DEBUG=1   for compiling with debugging information
+#   PREFIX=Some\Directory       Base directory for installation
+#   IIPREFIX=Some\\Directory    Same thing with doubled backslashes
 !if !defined(DLL)
 DLL=0
 !endif
@@ -23,9 +25,15 @@ MFLAGS=
 MFLAGS=-MD
 !endif
 !endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+!if !defined(IIPREFIX)
+IIPREFIX = c:\\usr
+!endif
 
 # Directories used by "make install":
-prefix = c:\usr
+prefix = $(PREFIX)
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
 libdir = $(exec_prefix)\lib
@@ -36,7 +44,7 @@ aliaspath =
 jardir = $(datadir)\gettext
 pkgdatadir = $(datadir)\gettext
 projectsdir = $(pkgdatadir)\projects
-IIprefix = c:\\usr
+IIprefix = $(IIPREFIX)
 IIexec_prefix = $(IIprefix)
 IIbindir = $(IIexec_prefix)\\bin
 IIlibdir = $(IIexec_prefix)\\lib