From 8b1a030160fb94929c0bfddc853da10b3d8bc1f6 Mon Sep 17 00:00:00 2001
From: bnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 21 Nov 2003 23:45:04 +0000
Subject: Fix up the NetWare make files so that they copy the right headers and
 libraries for the installdev target

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/APR_0_9_BRANCH@64783 13f79535-47bb-0310-9956-ffa450edef68
---
 build/NWGNUenvironment.inc | 25 +++++++++++++++++++++----
 build/NWGNUhead.inc        | 10 ----------
 2 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'build')

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 72997ff8c..44417d658 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -201,14 +201,31 @@ endif
 
 endif
 
+ifdef DEST
+INSTALLBASE := $(INSTALL)\Apache2
+
+INSTDEVDIRS := \
+    $(INSTDIRS) \
+	$(INSTALLBASE) \
+	$(INSTALLBASE)\include \
+	$(INSTALLBASE)\lib \
+
+INSTDIRS += \
+	$(INSTALLBASE) \
+	
+else
+INSTALLBASE := $(INSTALL)\apr
+
 INSTDEVDIRS := \
     $(INSTDIRS) \
-	$(INSTALL)\Apache2 \
-	$(INSTALL)\Apache2\include \
-	$(INSTALL)\Apache2\lib \
+	$(INSTALLBASE) \
+	$(INSTALLBASE)\include \
+	$(INSTALLBASE)\lib \
 
 INSTDIRS += \
-	$(INSTALL)\Apache2 \
+	$(INSTALLBASE) \
+	
+endif	
 
 #
 # Declare Command and tool macros here
diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc
index ac084d02b..444b2f364 100644
--- a/build/NWGNUhead.inc
+++ b/build/NWGNUhead.inc
@@ -36,16 +36,6 @@ all: $(SUBDIRS) libs nlms install
 
 $(TARGETS) :: $(SUBDIRS)
 
-install :: nlms $(INSTDIRS)
-
-installdev :: $(INSTDEVDIRS)
-
-$(INSTDIRS) ::
-	$(CHKNOT) $@\NUL mkdir $@
-
-$(INSTDEVDIRS) ::
-	$(CHKNOT) $@\NUL mkdir $@
-
 endif #NO_LICENSE_FILE check
 
 help :
-- 
cgit v1.2.1