Move ab, logresolve, httxt2dbm and apxs to bin from sbin, along with

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index f120e85b1c937449f2ed1b1793790fd5302eaa19..b37ed825f828982a3bc591930658ed2a6fefd425 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -226,6 +226,17 @@ TARGET_lib = \
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
+       $(OBJDIR)/apreq_cookie.o \
+       $(OBJDIR)/apreq_error.o \
+       $(OBJDIR)/apreq_module.o \
+       $(OBJDIR)/apreq_module_cgi.o \
+       $(OBJDIR)/apreq_module_custom.o \
+       $(OBJDIR)/apreq_param.o \
+       $(OBJDIR)/apreq_parser.o \
+       $(OBJDIR)/apreq_parser_header.o \
+       $(OBJDIR)/apreq_parser_multipart.o \
+       $(OBJDIR)/apreq_parser_urlencoded.o \
+       $(OBJDIR)/apreq_util.o \
        $(OBJDIR)/buildmark.o \
        $(OBJDIR)/config.o \
        $(OBJDIR)/connection.o \
@@ -386,7 +397,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)
 #
-MKCNF  = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2
+MKCNF  = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2
 
 install :: nlms instscripts FORCE
        $(call COPY,$(OBJDIR)/$(NLM_NAME).nlm,                         $(INSTALLBASE)/)
@@ -416,6 +427,7 @@ install :: nlms instscripts FORCE
        $(call MKCNF,docs/conf/extra/httpd-userdir.conf.in,            $(INSTALLBASE)/conf/extra/httpd-userdir.conf)
        $(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in,             $(INSTALLBASE)/conf/extra/httpd-vhosts.conf)
        $(call MKCNF,docs/conf/extra/httpd-ssl.conf.in,                $(INSTALLBASE)/conf/extra/httpd-ssl.conf)
+       $(call MKCNF,docs/conf/extra/proxy-html.conf.in,               $(INSTALLBASE)/conf/extra/proxy-html.conf)
        $(call COPYR,docs/docroot,                                     $(INSTALLBASE)/htdocs)
        $(call COPYR,docs/error,                                       $(INSTALLBASE)/error)
        $(call COPYR,docs/icons,                                       $(INSTALLBASE)/icons)