diff options
| author | Gerald Combs <gerald@wireshark.org> | 2004-12-01 16:56:37 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2004-12-01 16:56:37 +0000 |
| commit | 1007a85912c24103d6f986e2f41f6825ee73b5a2 (patch) | |
| tree | e4129ff136727cb8c6f32cc7f166b25bf96c7f69 | |
| parent | 679479be68b0a59758ffefa420fbb60d3138e1dd (diff) | |
If bash is run as a non-login shell, it doesn't read /etc/profile. Under
Cygwin this has the side effect of making the Windows "find" command appear
first in the path instead of Cygwin's "find" command. Call /usr/bin/find
explicitly in win32-setup.sh.
svn path=/trunk/; revision=12639
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | tools/win32-setup.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 414d63ebb8..7abae95438 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -386,6 +386,7 @@ REQUIRED_TOOLS=\ $(YACC) \ $(LEX) \ grep \ + /usr/bin/find \ $(PERL) \ $(PYTHON) \ sed \ diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index c3ee031217..7d62d1cc9f 100644 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -71,7 +71,7 @@ case "$1" in unzip -nq "$DEST_PATH/$PACKAGE" || err_exit "Couldn't unpack $DEST_PATH/$PACKAGE" echo "Verifying that the DLLs in $DEST_PATH/$DEST_SUBDIR are executable." - for i in `find $DEST_PATH/$DEST_SUBDIR -name \*\.dll` ; do + for i in `/usr/bin/find $DEST_PATH/$DEST_SUBDIR -name \*\.dll` ; do if [ ! -x "$i" ] ; then echo "Changing file permissions (add executable bit) to:" echo "$i" |