more NetWare build tweaks.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@789137 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 30 insertions, 37 deletions

diff --git a/dbd/NWGNUdbdfreetds b/dbd/NWGNUdbdfreetds
index 00cf3e583..35f36bbe0 100644
--- a/dbd/NWGNUdbdfreetds
+++ b/dbd/NWGNUdbdfreetds
@@ -11,10 +11,10 @@ SUBDIRS = \
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@ FREETDS_NLM = libfreetds
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(FREETDS_INC) \
 			$(EOLIST)
 
@@ -136,7 +135,7 @@ NLM_THREAD_NAME	= dbdfreetds
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -276,7 +275,7 @@ nlms :: libs $(TARGET_nlm)
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -289,7 +288,7 @@ install :: nlms FORCE
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 
diff --git a/dbd/NWGNUdbdmysql b/dbd/NWGNUdbdmysql
index 283bdaef3..b5677e43e 100644
--- a/dbd/NWGNUdbdmysql
+++ b/dbd/NWGNUdbdmysql
@@ -11,10 +11,10 @@ SUBDIRS = \
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@ MYSQL_NLM = libmysql
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(MYSQL_INC) \
 			$(EOLIST)
 
@@ -137,7 +136,7 @@ NLM_THREAD_NAME	= dbdmysql
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -277,7 +276,7 @@ nlms :: libs $(TARGET_nlm)
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -290,7 +289,7 @@ install :: nlms FORCE
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 
diff --git a/dbd/NWGNUdbdpgsql b/dbd/NWGNUdbdpgsql
index cd0c73a37..b1cbf2c51 100644
--- a/dbd/NWGNUdbdpgsql
+++ b/dbd/NWGNUdbdpgsql
@@ -11,10 +11,10 @@ SUBDIRS = \
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@ PGSQL_NLM = libpq
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(PGSQL_INC) \
 			$(EOLIST)
 
@@ -137,7 +136,7 @@ NLM_THREAD_NAME	= dbdpgsql
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -277,7 +276,7 @@ nlms :: libs $(TARGET_nlm)
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -290,7 +289,7 @@ install :: nlms FORCE
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 
diff --git a/dbd/NWGNUdbdsqli2 b/dbd/NWGNUdbdsqli2
index f1b1b065a..ef6766254 100644
--- a/dbd/NWGNUdbdsqli2
+++ b/dbd/NWGNUdbdsqli2
@@ -11,10 +11,10 @@ SUBDIRS = \
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@ SQLITE2_NLM = lsqlite2
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(SQLITE2_INC) \
 			$(EOLIST)
 
@@ -136,7 +135,7 @@ NLM_THREAD_NAME	= dbdsqli2
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -276,7 +275,7 @@ nlms :: libs $(TARGET_nlm)
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -289,7 +288,7 @@ install :: nlms FORCE
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 
diff --git a/dbd/NWGNUdbdsqli3 b/dbd/NWGNUdbdsqli3
index 7eb45c4d0..1e3f1ce3c 100644
--- a/dbd/NWGNUdbdsqli3
+++ b/dbd/NWGNUdbdsqli3
@@ -11,10 +11,10 @@ SUBDIRS = \
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@ SQLITE3_NLM = lsqlite3
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(SQLITE3_INC) \
 			$(EOLIST)
 
@@ -291,7 +290,7 @@ install :: nlms FORCE
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 
diff --git a/dbd/NWGNUmakefile b/dbd/NWGNUmakefile
index fb4b9ad7d..0fe62ee0b 100644
--- a/dbd/NWGNUmakefile
+++ b/dbd/NWGNUmakefile
@@ -10,7 +10,7 @@ SUBDIRS = \
 # paths to tools
 #
 
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 
 #
 # build this level's files
@@ -155,10 +155,8 @@ TARGET_nlm = \
 	$(EOLIST)
 
 ifeq "$(APU_HAVE_MYSQL)" "1"
-ifeq "$(wildcard apr_dbd_mysql.c)" "apr_dbd_mysql.c"
 TARGET_nlm += $(OBJDIR)/dbdmysql.nlm $(OBJDIR)/dbdmysql.nlm $(EOLIST)
 endif
-endif
 ifeq "$(APU_HAVE_PGSQL)" "1"
 TARGET_nlm += $(OBJDIR)/dbdpgsql.nlm $(OBJDIR)/dbdpgsql.nlm $(EOLIST)
 endif
@@ -257,6 +255,6 @@ install :: nlms $(INSTDIRS) FORCE
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc