From 4143a101691464831d0d467f1fb01105b8c6d1a2 Mon Sep 17 00:00:00 2001
From: Guenter Knauf <fuankg@apache.org>
Date: Sun, 28 Jun 2009 23:15:11 +0000
Subject: more NetWare build tweaks.

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

(limited to 'NWGNUmakefile')

diff --git a/NWGNUmakefile b/NWGNUmakefile
index c8012b170..3045e3049 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -174,7 +174,7 @@ XDCDATA		=
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/aprlib.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -397,21 +397,21 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms $(INSTDIRS) FORCE
-	copy $(TARGET_nlm)                                 $(INSTALLBASE)\*.*
+	$(CP) $(subst /,\,$(APR)\$(TARGET_nlm))             $(INSTALLBASE)\*.*
 ifndef DEST
-	-copy $(subst /,\,$(APR))\STATUS                   $(INSTALLBASE)\*.apr
-	-copy $(subst /,\,$(APR))\LICENSE                  $(INSTALLBASE)\*
-	-copy $(subst /,\,$(APR))\CHANGES                  $(INSTALLBASE)\*.apr
-	@-xcopy $(XCOPYSW) docs                            $(INSTALLBASE)\docs\*.*
+	-$(CP) $(subst /,\,$(APR))\STATUS                   $(INSTALLBASE)\*.apr
+	-$(CP) $(subst /,\,$(APR))\LICENSE                  $(INSTALLBASE)\*
+	-$(CP) $(subst /,\,$(APR))\CHANGES                  $(INSTALLBASE)\*.apr
+	@-$(XCP) $(subst /,\,$(APR))\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 $(TARGET_lib)                                 $(INSTALLBASE)\lib\*.*
-	copy $(TARGET_nlm)                                 $(INSTALLBASE)\bin\*.*
+	$(CP) $(subst /,\,$(APR))\include\*.h               $(INSTALLBASE)\include\*.*
+	$(CP) $(subst /,\,$(APR))\*.imp                     $(INSTALLBASE)\lib\*.*
+	$(CP) $(subst /,\,$(APR))\misc\netware\*.xdc        $(INSTALLBASE)\lib\*.*
+	$(CP) $(subst /,\,$(APR)\$(TARGET_lib))             $(INSTALLBASE)\lib\*.*
+	$(CP) $(subst /,\,$(APR)\$(TARGET_nlm))             $(INSTALLBASE)\bin\*.*
 
 $(INSTDEVDIRS) ::
 	$(CHKNOT) $@\NUL mkdir $@
-- 
cgit v1.2.1