Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 99390 invoked from network); 20 Oct 2010 11:31:38 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Oct 2010 11:31:38 -0000 Received: (qmail 62050 invoked by uid 500); 20 Oct 2010 11:31:38 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 61859 invoked by uid 500); 20 Oct 2010 11:31:36 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 61852 invoked by uid 99); 20 Oct 2010 11:31:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Oct 2010 11:31:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Oct 2010 11:31:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5BC9023888E4; Wed, 20 Oct 2010 11:30:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1025509 - /httpd/httpd/trunk/NWGNUmakefile Date: Wed, 20 Oct 2010 11:30:39 -0000 To: cvs@httpd.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101020113039.5BC9023888E4@eris.apache.org> Author: fuankg Date: Wed Oct 20 11:30:39 2010 New Revision: 1025509 URL: http://svn.apache.org/viewvc?rev=1025509&view=rev Log: NetWare build tweaks. Modified: httpd/httpd/trunk/NWGNUmakefile Modified: httpd/httpd/trunk/NWGNUmakefile URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=1025509&r1=1025508&r2=1025509&view=diff ============================================================================== --- httpd/httpd/trunk/NWGNUmakefile (original) +++ httpd/httpd/trunk/NWGNUmakefile Wed Oct 20 11:30:39 2010 @@ -387,16 +387,21 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms instscripts FORCE - -copy $(OBJDIR)\Apache2.nlm $(INSTALL)\$(BASEDIR)\*.* - -copy ABOUT_APACHE $(INSTALL)\$(BASEDIR)\*.* - -copy README $(INSTALL)\$(BASEDIR)\*.* - -copy STATUS $(INSTALL)\$(BASEDIR)\*.* - -copy LICENSE $(INSTALL)\$(BASEDIR)\*.* - -copy CHANGES $(INSTALL)\$(BASEDIR)\*.* - -copy VERSIONING $(INSTALL)\$(BASEDIR)\*.* - -copy support\dbmmanage.in $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl - -copy support\logresolve.pl.in $(INSTALL)\$(BASEDIR)\bin\logresolve.pl - -copy support\split-logfile.in $(INSTALL)\$(BASEDIR)\bin\split-logfile.pl + -copy $(OBJDIR)\$(NLM_NAME).nlm $(INSTALL)\$(BASEDIR)\*.* + -copy ABOUT_APACHE $(INSTALL)\$(BASEDIR)\*.* + -copy CHANGES $(INSTALL)\$(BASEDIR)\*.* + -copy LICENSE $(INSTALL)\$(BASEDIR)\*.* + -copy README $(INSTALL)\$(BASEDIR)\*.* + -copy VERSIONING $(INSTALL)\$(BASEDIR)\*.* + -copy STATUS $(INSTALL)\$(BASEDIR)\*.* + -copy support\dbmmanage.in $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl + -copy support\logresolve.pl.in $(INSTALL)\$(BASEDIR)\bin\logresolve.pl + -copy support\split-logfile.in $(INSTALL)\$(BASEDIR)\bin\split-logfile.pl + -copy support\check_forensic $(INSTALL)\$(BASEDIR)\bin\check_forensic.sh + -copy docs\conf\magic $(INSTALL)\$(BASEDIR)\conf\magic + -copy docs\conf\mime.types $(INSTALL)\$(BASEDIR)\conf\mime.types + -copy docs\conf\charset.conv $(INSTALL)\$(BASEDIR)\conf\charset.conv + -copy docs\cgi-examples\printenv $(INSTALL)\$(BASEDIR)\cgi-bin\printenv.pl -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf $(CHKNOT) $(INSTALL)\$(BASEDIR)\conf\extra\nul mkdir $(INSTALL)\$(BASEDIR)\conf\extra -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-autoindex.conf @@ -410,31 +415,27 @@ install :: nlms instscripts FORCE -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-userdir.conf -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-vhosts.conf -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-ssl.conf - -copy docs\conf\magic $(INSTALL)\$(BASEDIR)\conf\magic - -copy docs\conf\mime.types $(INSTALL)\$(BASEDIR)\conf\mime.types - -copy docs\conf\charset.conv $(INSTALL)\$(BASEDIR)\conf\charset.conv - -copy docs\cgi-examples\printenv $(INSTALL)\$(BASEDIR)\cgi-bin\printenv.pl - @xcopy $(XCOPYSW) docs\error $(INSTALL)\$(BASEDIR)\error - @xcopy $(XCOPYSW) docs\docroot $(INSTALL)\$(BASEDIR)\htdocs - @xcopy $(XCOPYSW) docs\icons $(INSTALL)\$(BASEDIR)\icons - @xcopy $(XCOPYSW) docs\man $(INSTALL)\$(BASEDIR)\man - @xcopy $(XCOPYSW) docs\manual $(INSTALL)\$(BASEDIR)\manual + @xcopy $(XCOPYSW) docs\error $(INSTALL)\$(BASEDIR)\error + @xcopy $(XCOPYSW) docs\docroot $(INSTALL)\$(BASEDIR)\htdocs + @xcopy $(XCOPYSW) docs\icons $(INSTALL)\$(BASEDIR)\icons + @xcopy $(XCOPYSW) docs\man $(INSTALL)\$(BASEDIR)\man + @xcopy $(XCOPYSW) docs\manual $(INSTALL)\$(BASEDIR)\manual installdev :: FORCE - -copy $(subst /,\,$(AP_WORK))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* - -copy $(subst /,\,$(AP_WORK))\os\netware\*.h $(INSTALL)\$(BASEDIR)\include\*.* - -copy $(subst /,\,$(NWOS))\*.imp $(INSTALL)\$(BASEDIR)\lib\*.* - -copy $(subst /,\,$(APR))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* - -copy $(subst /,\,$(APRUTIL))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* - -copy $(subst /,\,$(APR))\*.imp $(INSTALL)\$(BASEDIR)\lib\*.* - -copy $(subst /,\,$(NWOS))\*.xdc $(INSTALL)\$(BASEDIR)\lib\*.* + -copy $(subst /,\,$(AP_WORK))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(NWOS))\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(APR))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(APRUTIL))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(APR))\*.imp $(INSTALL)\$(BASEDIR)\lib\*.* + -copy $(subst /,\,$(NWOS))\*.imp $(INSTALL)\$(BASEDIR)\lib\*.* + -copy $(subst /,\,$(NWOS))\*.xdc $(INSTALL)\$(BASEDIR)\lib\*.* prebuild :: FORCE - $(MAKE) -C server -f NWGNUMakefile - $(MAKE) -C $(PCRE) -f NWGNUMakefile + $(MAKE) -C server -f NWGNUmakefile + $(MAKE) -C srclib/pcre -f NWGNUmakefile $(CHKNOT) $(PREBUILD_INST)\nul mkdir $(PREBUILD_INST) -copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.* - -copy $(PCRE)\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.* + -copy $(AP_WORK)\srclib\pcre\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.* # # Any specialized rules here