httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1087190 - /httpd/httpd/trunk/build/NWGNUtail.inc
Date Thu, 31 Mar 2011 05:40:55 GMT
Author: fuankg
Date: Thu Mar 31 05:40:55 2011
New Revision: 1087190

URL: http://svn.apache.org/viewvc?rev=1087190&view=rev
Log:
Fixed NetWare version number in linker script.

A trailing space is required when building on Win32
or else the last number is treated as IO redirection;
also moved ifeq out of target rule to the top.

Modified:
    httpd/httpd/trunk/build/NWGNUtail.inc

Modified: httpd/httpd/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUtail.inc?rev=1087190&r1=1087189&r2=1087190&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUtail.inc (original)
+++ httpd/httpd/trunk/build/NWGNUtail.inc Thu Mar 31 05:40:55 2011
@@ -43,6 +43,10 @@ ifeq "$(NLM_EXIT_SYM)" ""
 NLM_EXIT_SYM = _LibCPostlude
 endif
 
+ifeq "$(NLM_VERSION)" ""
+NLM_VERSION = $(VERSION)
+endif
+
 #
 # Create dependency lists based on the files available
 #
@@ -282,11 +286,7 @@ endif
 	@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $(@:.opt=.def)
 	@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $(@:.opt=.def)
 	@echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>>
$(@:.opt=.def)
-ifneq "$(NLM_VERSION)" ""
-	@echo $(DL)version $(NLM_VERSION)$(DL)>> $(@:.opt=.def)
-else
-	@echo $(DL)version $(VERSION)$(DL)>> $(@:.opt=.def)
-endif
+	@echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def)
 	@echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $(@:.opt=.def)
 	@echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $(@:.opt=.def)
 ifneq "$(NLM_CHECK_SYM)" ""



Mime
View raw message