]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
NetWare build system: fixed var names.
authorGuenter Knauf <fuankg@apache.org>
Tue, 1 May 2012 21:30:02 +0000 (21:30 +0000)
committerGuenter Knauf <fuankg@apache.org>
Tue, 1 May 2012 21:30:02 +0000 (21:30 +0000)
Renamed wrong and misleading var names in makefiles.
No functional change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1332842 13f79535-47bb-0310-9956-ffa450edef68

build/NWGNUenvironment.inc
build/NWGNUmakefile

index d49b6ead7f2600f784362609d7ae681e963239ea..24f74a6192d744746e1e1c6ac313f1897ada6c25 100644 (file)
@@ -212,16 +212,16 @@ PLIB3S    = $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++/MWCPP
 
 ifeq "$(OS)" "Windows_NT"
 # MetroWerks Win32 build flags to create build tools
-MWCW_MSL    = "$(METROWERKS)/MSL"
-MWCW_W32    = "$(METROWERKS)/Win32-x86 Support"
-HOST_CC     = $(WIN_CC)
-HOST_CFLAGS =  -O2 -gccinc -nodefaults -proc 586 -w off
-HOST_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
-HOST_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+MWCW_MSL         = "$(METROWERKS)/MSL"
+MWCW_W32         = "$(METROWERKS)/Win32-x86 Support"
+CC_FOR_BUILD     = $(WIN_CC)
+CFLAGS_FOR_BUILD =  -O2 -gccinc -nodefaults -proc 586 -w off
+CFLAGS_FOR_BUILD += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
+CFLAGS_FOR_BUILD += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
 else
 # GNUC build flags to create build tools
-HOST_CC     = gcc
-HOST_CFLAGS = -Wall -O2
+CC_FOR_BUILD     = gcc
+CFLAGS_FOR_BUILD = -Wall -O2
 endif
 
 # Base compile flags
index a2618bf89338620d3a2569e8206a0f8f94fec065..07d6cea590dca2efb980689ff1e2943698cf6ecd 100644 (file)
@@ -70,7 +70,7 @@ $(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c
 
 %.exe: $(PCRE)/%.c $(PCRE)/config.h $(PCRE)/pcre.h
        @echo $(DL)Creating Build Helper $@$(DL)
-       $(HOST_CC) $(HOST_CFLAGS) -DHAVE_CONFIG_H $< -o $@
+       $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DHAVE_CONFIG_H $< -o $@
 
 $(NWOS)/test_char.h: gen_test_char.exe $(SERVER)/gen_test_char.c
        @echo $(DL)GEN  $@$(DL)
@@ -78,7 +78,7 @@ $(NWOS)/test_char.h: gen_test_char.exe $(SERVER)/gen_test_char.c
 
 %.exe: $(SERVER)/%.c
        @echo $(DL)Creating Build Helper $@$(DL)
-       $(HOST_CC) $(HOST_CFLAGS) -DCROSS_COMPILE $< -o $@
+       $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE $< -o $@
 
 else