diff options
| author | Guenter Knauf <fuankg@apache.org> | 2011-03-16 00:18:05 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2011-03-16 00:18:05 +0000 |
| commit | 4c52b0b789551bcc20a25566865d4e57f0343982 (patch) | |
| tree | 613e81897171d2f049b51995281b17cb1670979a /build | |
| parent | 1e33d8d022aaae3677d136e3c7a13d6a39f35183 (diff) | |
| download | httpd-4c52b0b789551bcc20a25566865d4e57f0343982.tar.gz | |
Some more NetWare build fine tuning of tools usage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082009 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/NWGNUenvironment.inc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 3b4c8c95ef..1510747e54 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -134,16 +134,21 @@ WIN_CC = mwcc AWK = awk SORT = sort +# Setup distribution tools +ZIP = zip -qr9 +7ZA = 7za >NUL a + # # Declare Command and tool macros here # ifeq ($(findstring /sh,$(SHELL)),/sh) DEL = rm -f $1 -RMDIR = rm -rf $1 +RMDIR = rm -fr $1 MKDIR = mkdir -p $1 -COPY = -cp -av $1 $2 -COPYR = -cp -ar $1 $2 +COPY = -cp -afv $1 $2 +#COPYR = -cp -afr $1/* $2 +COPYR = -rsync -aC $1/* $2 ECHONL = echo "" DL = ' CAT = cat @@ -151,15 +156,14 @@ else ifeq "$(OS)" "Windows_NT" DEL = $(shell if exist $(subst /,\,$1) del /q /f 2>NUL $(subst /,\,$1)) RMDIR = $(shell if exist $(subst /,\,$1)\NUL rd /q /s 2>NUL $(subst /,\,$1)) -ECHONL = cmd /c echo. else DEL = $(shell if exist $(subst /,\,$1) del 2>NUL $(subst /,\,$1)) RMDIR = $(shell if exist $(subst /,\,$1)\NUL deltree /y 2>NUL $(subst /,\,$1)) -ECHONL = command /c echo. endif +ECHONL = $(ComSpec) /c echo. MKDIR = $(shell if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1)) COPY = -copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2) -COPYR = -xcopy /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2) +COPYR = -xcopy /q /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2) CAT = type endif |