Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 69999 invoked from network); 9 Oct 2010 19:00:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Oct 2010 19:00:44 -0000 Received: (qmail 95804 invoked by uid 500); 9 Oct 2010 19:00:44 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 95703 invoked by uid 500); 9 Oct 2010 19:00:43 -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 95696 invoked by uid 99); 9 Oct 2010 19:00:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Oct 2010 19:00:43 +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; Sat, 09 Oct 2010 19:00:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2EE3B2388A38; Sat, 9 Oct 2010 19:00:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1006213 - in /apr/apr/branches/1.3.x: NWGNUmakefile build/NWGNUenvironment.inc Date: Sat, 09 Oct 2010 19:00:23 -0000 To: commits@apr.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101009190023.2EE3B2388A38@eris.apache.org> Author: fuankg Date: Sat Oct 9 19:00:22 2010 New Revision: 1006213 URL: http://svn.apache.org/viewvc?rev=1006213&view=rev Log: Minor NetWare makefile fixes. Modified: apr/apr/branches/1.3.x/NWGNUmakefile apr/apr/branches/1.3.x/build/NWGNUenvironment.inc Modified: apr/apr/branches/1.3.x/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/NWGNUmakefile?rev=1006213&r1=1006212&r2=1006213&view=diff ============================================================================== --- apr/apr/branches/1.3.x/NWGNUmakefile (original) +++ apr/apr/branches/1.3.x/NWGNUmakefile Sat Oct 9 19:00:22 2010 @@ -1,4 +1,20 @@ # +# Define our macros with defaults if we dont got them already. +# +ifndef APR_WORK +export APR_WORK = $(CURDIR) +endif +ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h" +$(error APR_WORK does not point to a valid APR source tree) +endif +ifndef APU_WORK +export APU_WORK = $(CURDIR)/../apr-util +endif +ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h" +$(error APU_WORK does not point to a valid APU source tree) +endif + +# # Declare the sub-directories to be built here # Modified: apr/apr/branches/1.3.x/build/NWGNUenvironment.inc URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/build/NWGNUenvironment.inc?rev=1006213&r1=1006212&r2=1006213&view=diff ============================================================================== --- apr/apr/branches/1.3.x/build/NWGNUenvironment.inc (original) +++ apr/apr/branches/1.3.x/build/NWGNUenvironment.inc Sat Oct 9 19:00:22 2010 @@ -234,14 +234,14 @@ endif INSTALLBASE := $(INSTALL)\$(BASEDIR) INSTDEVDIRS := \ - $(INSTDIRS) \ + $(INSTDIRS) \ $(INSTALLBASE) \ $(INSTALLBASE)\include \ $(INSTALLBASE)\lib \ INSTDIRS += \ $(INSTALLBASE) \ - + else INSTALLBASE := $(INSTALL)\apr @@ -254,7 +254,7 @@ INSTDEVDIRS := \ INSTDIRS += \ $(INSTALLBASE) \ -endif +endif # # Declare Command and tool macros here @@ -289,9 +289,9 @@ CHKNOT = $(CMD) if not exist # APR = $(APR_WORK) -APRTEST = $(APR_WORK)/test +APRTEST = $(APR)/test APRUTIL = $(APU_WORK) -APULDAP = $(APU_WORK)/ldap +APULDAP = $(APRUTIL)/ldap XML = $(APRUTIL)/xml #