From 3ed40a7f8c3ae99f7d24a805aae657d60fa17e1e Mon Sep 17 00:00:00 2001
From: Guenter Knauf <fuankg@apache.org>
Date: Sun, 28 Jun 2009 01:23:19 +0000
Subject: some more NetWare build tweaks.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@789031 13f79535-47bb-0310-9956-ffa450edef68
---
 NWGNUmakefile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'NWGNUmakefile')

diff --git a/NWGNUmakefile b/NWGNUmakefile
index add30eeaa..3c50ab89a 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -385,22 +385,21 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms $(INSTDIRS) FORCE
-	copy $(OBJDIR)\aprlib.nlm                          $(INSTALLBASE)\*.*
+	copy $(TARGET_nlm)                                 $(INSTALLBASE)\*.*
 ifndef DEST
 	-copy $(subst /,\,$(APR))\STATUS                   $(INSTALLBASE)\*.apr
 	-copy $(subst /,\,$(APR))\LICENSE                  $(INSTALLBASE)\*
 	-copy $(subst /,\,$(APR))\CHANGES                  $(INSTALLBASE)\*.apr
-	@echo rem copying the docs directories > xc.bat
-	@echo xcopy docs $(INSTALLBASE)\docs\*.* $(XCOPYSW) >> xc.bat
-	$(CMD) xc.bat
-	$(DEL) xc.bat
+	@-xcopy $(XCOPYSW) docs                            $(INSTALLBASE)\docs\*.*
 endif
 
 ifndef DEST
 installdev :: $(INSTDEVDIRS) FORCE
-	-copy $(subst /,\,$(APR))\include\*.h               $(INSTALLBASE)\include\*.*
-	-copy $(subst /,\,$(APR))\*.imp                     $(INSTALLBASE)\lib\*.*
-	-copy $(subst /,\,$(APR))\misc\netware\*.xdc        $(INSTALLBASE)\lib\*.*
+	copy $(subst /,\,$(APR))\include\*.h               $(INSTALLBASE)\include\*.*
+	copy $(subst /,\,$(APR))\*.imp                     $(INSTALLBASE)\lib\*.*
+	copy $(subst /,\,$(APR))\misc\netware\*.xdc        $(INSTALLBASE)\lib\*.*
+	copy $(TARGET_lib)                                 $(INSTALLBASE)\lib\*.*
+	copy $(TARGET_nlm)                                 $(INSTALLBASE)\bin\*.*
 
 $(INSTDEVDIRS) ::
 	$(CHKNOT) $@\NUL mkdir $@
-- 
cgit v1.2.1