Add CHANGES' security entries for 2.4.27.

[apache] / support / NWGNUhtpasswd

diff --git a/support/NWGNUhtpasswd b/support/NWGNUhtpasswd
index 1cbc34472960ec33dcd4298c3dc9b0bfd9681fe0..124895b135d8db8d0a555f53e0d4b2db6ecc8317 100644 (file)
--- a/support/NWGNUhtpasswd
+++ b/support/NWGNUhtpasswd
@@ -8,7 +8,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
+include $(AP_WORK)/build/NWGNUhead.inc
 endif
 
 #
@@ -17,10 +17,9 @@ endif
 #
 XINCDIRS       += \
                        $(NWOS) \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr/misc/netware \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR)/misc/netware \
                        $(EOLIST)
 
 #
@@ -98,7 +97,7 @@ NLM_NAME              = htpasswd
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION        = HT Password Utility for NetWare
+NLM_DESCRIPTION        = Apache $(VERSION_STR) HT Password Utility for NetWare
 
 #
 # This is used by the '-threadname' directive.  If left blank,
@@ -114,7 +113,7 @@ NLM_SCREEN_NAME = htpasswd Password Management
 
 #
 # If this is specified, it will override VERSION value in 
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(AP_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION            =
 
@@ -127,12 +126,12 @@ NLM_STACK_SIZE    = 8192
 #
 # 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
@@ -170,6 +169,7 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/htpasswd.o \
+       $(OBJDIR)/passwd_common.o \
        $(EOLIST)
 
 #
@@ -177,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)
 
 #
@@ -208,7 +208,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
+       @aprlib.imp \
        @libc.imp \
        $(EOLIST)
  
@@ -235,7 +235,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
 
@@ -248,5 +248,5 @@ install :: nlms FORCE
 # in this makefile
 #
 
-include $(AP_WORK)\build\NWGNUtail.inc
+include $(APBUILD)/NWGNUtail.inc