diff options
| -rw-r--r-- | NWGNUmakefile | 15 | ||||
| -rw-r--r-- | build/NWGNUenvironment.inc | 1 |
2 files changed, 8 insertions, 8 deletions
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 $@ diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 92ae226ab..0b4022e0b 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -238,6 +238,7 @@ INSTDEVDIRS := \ $(INSTALLBASE) \ $(INSTALLBASE)\include \ $(INSTALLBASE)\lib \ + $(INSTALLBASE)\bin INSTDIRS += \ $(INSTALLBASE) |