summaryrefslogtreecommitdiff
path: root/NWGNUmakefile
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2009-06-28 23:15:11 +0000
committerGuenter Knauf <fuankg@apache.org>2009-06-28 23:15:11 +0000
commit4143a101691464831d0d467f1fb01105b8c6d1a2 (patch)
tree3d82f7730190666a85a8f71a44b1a6f6c38f8b1e /NWGNUmakefile
parent04552e1dc10a7c89a4053ecebabf6d75d39fa624 (diff)
downloadapr-4143a101691464831d0d467f1fb01105b8c6d1a2.tar.gz
more NetWare build tweaks.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@789172 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'NWGNUmakefile')
-rw-r--r--NWGNUmakefile22
1 files changed, 11 insertions, 11 deletions
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 $@