apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1006213 - in /apr/apr/branches/1.3.x: NWGNUmakefile build/NWGNUenvironment.inc
Date Sat, 09 Oct 2010 19:00:23 GMT
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
 
 #



Mime
View raw message