Commit 519457cf authored by Ian Lynagh's avatar Ian Lynagh

FIX BUILD Use the right find on Windows systems; fixes bindist creation

parent 6099982b
......@@ -611,6 +611,11 @@ echo foo > conftest.txt
$fp_prog_find conftest.txt -print > conftest.out 2>&1
if grep '^conftest.txt$' conftest.out > /dev/null 2>&1 ; then
# OK, looks like a real "find".
if which cygpath 1> /dev/null 2> /dev/null
then
fp_prog_find=`cygpath --mixed "$fp_prog_find"`
AC_MSG_NOTICE([Converted to "$fp_prog_find"])
fi
FindCmd="$fp_prog_find"
else
# Found a poor WinDoze version of "find", ignore it.
......
......@@ -243,7 +243,7 @@ binary-dist.library.%:
ifBuildable/ifBuildable $* cp setup/Setup $(BIN_DIST_LIBDIR)/$*/setup
ifBuildable/ifBuildable $* cp $*.cabal $(BIN_DIST_LIBDIR)/$*
ifBuildable/ifBuildable $* cp -a dist $(BIN_DIST_LIBDIR)/$*
ifBuildable/ifBuildable $* find $(BIN_DIST_LIBDIR)/$*/dist \
ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
\( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \
-exec rm {} \;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment