Author: wrowe
Date: Wed Dec 26 13:42:06 2007
New Revision: 606957
URL: http://svn.apache.org/viewvc?rev=606957&view=rev
Log:
win32 find.exe != bsd/gnu find, and we want the native flavor.
This fails on ancient OS's, but then again, ancient flavors won't
be compiling to x64.
Backport: r606955
Modified:
apr/apr/branches/1.2.x/Makefile.win
apr/apr/branches/1.2.x/test/Makefile.win
Modified: apr/apr/branches/1.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/Makefile.win?rev=606957&r1=606956&r2=606957&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/Makefile.win (original)
+++ apr/apr/branches/1.2.x/Makefile.win Wed Dec 26 13:42:06 2007
@@ -45,7 +45,8 @@
PREFIX=..\apr-dist
-!IF [$(COMSPEC) /c cl /nologo /? | find "x64" >NUL ] == 0
+!IF [$(COMSPEC) /c cl /nologo /? \
+ | $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
ARCH=x64 Release
!ELSE
ARCH=Win32 Release
Modified: apr/apr/branches/1.2.x/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/Makefile.win?rev=606957&r1=606956&r2=606957&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/Makefile.win (original)
+++ apr/apr/branches/1.2.x/test/Makefile.win Wed Dec 26 13:42:06 2007
@@ -33,7 +33,8 @@
OUTDIR=Release
!ENDIF
-!IF [$(COMSPEC) /c cl /nologo /? | find "x64" >NUL ] == 0
+!IF [$(COMSPEC) /c cl /nologo /? \
+ | $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
OUTDIR=x64\$(OUTDIR)
!ENDIF
!ENDIF
|