]> granicus.if.org Git - apache/commitdiff
Fixed NetWare version number in linker script.
authorGuenter Knauf <fuankg@apache.org>
Thu, 31 Mar 2011 05:40:55 +0000 (05:40 +0000)
committerGuenter Knauf <fuankg@apache.org>
Thu, 31 Mar 2011 05:40:55 +0000 (05:40 +0000)
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087190 13f79535-47bb-0310-9956-ffa450edef68

build/NWGNUtail.inc

index ebd2f958a90c61e33c9f61ce9fb7ec883eab9c5d..d867a1f03a6e612c5859534f7fa7c9c8f7ebf6b9 100644 (file)
@@ -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)" ""