Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 41449 invoked from network); 1 Jul 2009 17:24:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Jul 2009 17:24:29 -0000 Received: (qmail 22482 invoked by uid 500); 1 Jul 2009 17:24:40 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 22402 invoked by uid 500); 1 Jul 2009 17:24:39 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 22393 invoked by uid 99); 1 Jul 2009 17:24:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2009 17:24:39 +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, 01 Jul 2009 17:24:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 63189238888E; Wed, 1 Jul 2009 17:24:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r790281 - in /apr/apr/branches/1.4.x/build: NWGNUenvironment.inc NWGNUtail.inc Date: Wed, 01 Jul 2009 17:24:17 -0000 To: commits@apr.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090701172417.63189238888E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fuankg Date: Wed Jul 1 17:24:16 2009 New Revision: 790281 URL: http://svn.apache.org/viewvc?rev=790281&view=rev Log: few NetWare build improvements. Modified: apr/apr/branches/1.4.x/build/NWGNUenvironment.inc apr/apr/branches/1.4.x/build/NWGNUtail.inc Modified: apr/apr/branches/1.4.x/build/NWGNUenvironment.inc URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/NWGNUenvironment.inc?rev=790281&r1=790280&r2=790281&view=diff ============================================================================== --- apr/apr/branches/1.4.x/build/NWGNUenvironment.inc (original) +++ apr/apr/branches/1.4.x/build/NWGNUenvironment.inc Wed Jul 1 17:24:16 2009 @@ -111,6 +111,9 @@ LINK = mwldnlm LIB = mwldnlm -type library -w nocmdline +# Setup build tools +AWK = awk + ifdef IPV6 ifndef USE_STDSOCKETS USE_STDSOCKETS=1 @@ -227,28 +230,19 @@ INSTALLBASE := $(INSTALL)\$(BASEDIR) -INSTDEVDIRS := \ - $(INSTDIRS) \ - $(INSTALLBASE) \ - $(INSTALLBASE)\include \ - $(INSTALLBASE)\lib \ - -INSTDIRS += \ - $(INSTALLBASE) \ - else + INSTALLBASE := $(INSTALL)\apr -INSTDEVDIRS := \ - $(INSTDIRS) \ - $(INSTALLBASE) \ - $(INSTALLBASE)\include \ - $(INSTALLBASE)\lib \ +endif INSTDIRS += \ - $(INSTALLBASE) \ - -endif + $(INSTALLBASE) + +INSTDEVDIRS := \ + $(INSTDIRS) \ + $(INSTALLBASE)\include \ + $(INSTALLBASE)\lib # # Declare Command and tool macros here Modified: apr/apr/branches/1.4.x/build/NWGNUtail.inc URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/NWGNUtail.inc?rev=790281&r1=790280&r2=790281&view=diff ============================================================================== --- apr/apr/branches/1.4.x/build/NWGNUtail.inc (original) +++ apr/apr/branches/1.4.x/build/NWGNUtail.inc Wed Jul 1 17:24:16 2009 @@ -83,9 +83,10 @@ # Generic compiler rules # -$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\include\apr_version.h $(APR_WORK)\build\nw_ver.awk +ifneq ($(MAKECMDGOALS),clean) +$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h @echo Generating $(subst /,\,$@) - awk -f $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h > $(APR_WORK)\build\NWGNUversion.inc + @$(AWK) -f $^ > $@ -include $(APR_WORK)\build\NWGNUversion.inc @@ -95,6 +96,7 @@ VERSION = 1,0,0 VERSION_STR = 1.0.0 endif +endif ifeq "$(words $(strip $(TARGET_nlm)))" "1" INCLUDE_BLDCMDS=1