Merge the AP_OPENSSL_USE_ERRNO_THREADID check to trunk for wider testing

[apache] / build / NWGNUscripts.inc

diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc
index ecaa7f6ae516750c2b4dfce3fa66f6129fc96b1a..27029ebb744207f50b3ed9235e94440aed82e689 100644 (file)
--- a/build/NWGNUscripts.inc
+++ b/build/NWGNUscripts.inc
@@ -1,43 +1,43 @@
-# Include for creating start/stop/restart NCF scripts.\r
-\r
-instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2start.ncf:\r
-       @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
-       @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@\r
-       @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@\r
-       @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@\r
-       @echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
-       @echo $(DL)# If you have problems with 3rd-party modules try to load in OS space.$(DL)>> $@\r
-       @echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2auto.ncf:\r
-       @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
-       @echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@\r
-       @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@\r
-       @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@\r
-       @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@\r
-       @echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2rest.ncf:\r
-       @echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@\r
-       @echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@\r
-       @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@\r
-       @echo $(DL)# apache2 restart$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2stop.ncf:\r
-       @echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@\r
-       @echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@\r
-       @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@\r
-       @echo $(DL)# apache2 shutdown$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2prod.ncf:\r
-       @echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@\r
-       @echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@\r
-       @echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@\r
-       @$(ECHONL)>> $@\r
-\r
+# Include for creating start/stop/restart NCF scripts.
+
+instscripts:: FORCE $(INSTALLBASE)/ap2start.ncf $(INSTALLBASE)/ap2auto.ncf $(INSTALLBASE)/ap2rest.ncf $(INSTALLBASE)/ap2stop.ncf
+
+$(INSTALLBASE)/ap2start.ncf:
+       @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@
+       @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@
+       @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@
+       @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@
+       @echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@
+       @echo $(DL)# If you have problems with 3rd-party modules try to load in OS space.$(DL)>> $@
+       @echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@
+       @$(ECHONL)>> $@
+
+$(INSTALLBASE)/ap2auto.ncf:
+       @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@
+       @echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@
+       @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@
+       @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@
+       @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@
+       @echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@
+       @$(ECHONL)>> $@
+
+$(INSTALLBASE)/ap2rest.ncf:
+       @echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@
+       @echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@
+       @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@
+       @echo $(DL)# apache2 restart$(DL)>> $@
+       @$(ECHONL)>> $@
+
+$(INSTALLBASE)/ap2stop.ncf:
+       @echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@
+       @echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@
+       @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@
+       @echo $(DL)# apache2 shutdown$(DL)>> $@
+       @$(ECHONL)>> $@
+
+$(INSTALLBASE)/ap2prod.ncf:
+       @echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@
+       @echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@
+       @echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@
+       @$(ECHONL)>> $@
+