From: Bruno Haible Date: Thu, 3 Apr 2003 11:34:57 +0000 (+0000) Subject: The customizable variable must be called $(PREFIX), not $(prefix), because X-Git-Tag: v0.12~109 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bfd53bb6654f47644396c46cd3e06e7c974fdb2;p=thirdparty%2Fgettext.git 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 c5513e02f..a5feeac16 100644 --- 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 727043119..40319b018 100644 --- 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 69f77220c..779c1f91e 100644 --- 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 404ce0039..e7a68d617 100644 --- 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 6c0f511cb..6119e829a 100644 --- 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 2d27ba824..7ef708ec8 100644 --- 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 b0abb5a57..d2cc583d6 100755 --- 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 28d6456af..dd8b6c6f6 100644 --- 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 a0e291610..3b12cf0f8 100644 --- 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 04d79f2b5..13f7612bb 100644 --- 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 b49a2b72b..8fe5eb204 100644 --- 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 8746e5523..138a6b7f1 100644 --- 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 c4627049f..3286fe2a0 100644 --- 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 b0abb5a57..d2cc583d6 100755 --- 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 c9c492d5b..d776e00b8 100644 --- 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