From 519457cfd49b063f85e9595357e233feb5f0a7af Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 16 May 2007 12:16:07 +0000 Subject: [PATCH] FIX BUILD Use the right find on Windows systems; fixes bindist creation --- aclocal.m4 | 5 +++++ libraries/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index 1e79fd9..eca417a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -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. diff --git a/libraries/Makefile b/libraries/Makefile index ddbb6f3..7aed6b0 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -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 {} \; -- 1.7.10.4