X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=support%2FNWGNUlogres;h=33ccfe0e32d97a25a726b20d96286f202dd7da08;hb=633a12126d456489ccccfd0bdbc2bffb57e30083;hp=023c8e44da33209cbd04c6b02d9c8e9b9e114ee4;hpb=804ff9ab226d97742ed8d18d72d98ce05b80b578;p=apache

diff --git a/support/NWGNUlogres b/support/NWGNUlogres
index 023c8e44da..33ccfe0e32 100644
--- a/support/NWGNUlogres
+++ b/support/NWGNUlogres
@@ -8,7 +8,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
+include $(AP_WORK)/build/NWGNUhead.inc
 endif
 
 #
@@ -21,7 +21,6 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(APR)/misc/netware \
-			$(APR) \
 			$(EOLIST)
 
 #
@@ -115,7 +114,7 @@ NLM_SCREEN_NAME = Log Resolve
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(AP_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION		=
 
@@ -128,12 +127,12 @@ NLM_STACK_SIZE	= 65536
 #
 # If this is specified it will be used by the link '-entry' directive
 #
-NLM_ENTRY_SYM	= _LibCPrelude
+NLM_ENTRY_SYM	=
 
 #
 # If this is specified it will be used by the link '-exit' directive
 #
-NLM_EXIT_SYM	= _LibCPostlude
+NLM_EXIT_SYM	=
 
 #
 # If this is specified it will be used by the link '-check' directive
@@ -178,7 +177,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-   	libcpre.o \
+   	$(PRELUDE) \
 	$(EOLIST)
 
 #
@@ -209,11 +208,16 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
-	@ws2nlm.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	       $(EOLIST)
+endif
+ 
 #
 # Any symbols exported to here
 #
@@ -237,7 +241,7 @@ nlms :: libs $(TARGET_nlm)
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -250,5 +254,5 @@ install :: nlms FORCE
 # in this makefile
 #
 
-include $(AP_WORK)\build\NWGNUtail.inc
+include $(APBUILD)/NWGNUtail.inc