From 00ab6bddb361a6cb256f009a30fb9d6d8447f4b2 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Fri, 4 Mar 2011 11:19:49 +0000 Subject: NetWare build overhaul in order to compile on Linux. Part 2. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1077882 13f79535-47bb-0310-9956-ffa450edef68 --- NWGNUmakefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'NWGNUmakefile') diff --git a/NWGNUmakefile b/NWGNUmakefile index 69e267bae..aae431242 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -423,24 +423,24 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples) # install :: nlms $(INSTDIRS) FORCE - $(CP) $(subst /,\,$(APR)\$(TARGET_nlm)) $(INSTALLBASE)\*.* + $(call CP,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/) ifndef DEST - -$(CP) $(subst /,\,$(APR))\STATUS $(INSTALLBASE)\*.apr - -$(CP) $(subst /,\,$(APR))\LICENSE $(INSTALLBASE)\* - -$(CP) $(subst /,\,$(APR))\CHANGES $(INSTALLBASE)\*.apr - @-$(XCP) $(subst /,\,$(APR))\docs $(INSTALLBASE)\docs\*.* + -$(call CP,$(APR)/STATUS,$(INSTALLBASE)/*.apr) + -$(call CP,$(APR)/LICENSE,$(INSTALLBASE)/) + -$(call CP,$(APR)/CHANGES,$(INSTALLBASE)/*.apr) + @-$(call XCP,$(APR)/docs,$(INSTALLBASE)/docs/) endif ifndef DEST installdev :: $(INSTDEVDIRS) FORCE - $(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\*.* + $(call CP,$(APR)/include/*.h,$(INSTALLBASE)/include/) + $(call CP,$(APR)/*.imp,$(INSTALLBASE)/lib/) + $(call CP,$(APR)/misc/netware/*.xdc,$(INSTALLBASE)/lib/) + $(call CP,$(APR)/$(TARGET_lib),$(INSTALLBASE)/lib/) + $(call CP,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/bin/) $(INSTDEVDIRS) :: - $(CHKNOT) $@\NUL mkdir $@ + $(call MD,$@) endif # -- cgit v1.2.1